turn on laszip by default, fix up laszip tests

libLAS · Jul 22, 2014 · 8d7075b · 8d7075b
1 parent f6931a1
commit 8d7075b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -206,17 +206,15 @@ set(WITH_LASZIP FALSE CACHE BOOL "Choose if LASzip support should be built")
 set(WITH_STATIC_LASZIP FALSE CACHE BOOL "Choose of LASzip should be statically linked")
 mark_as_advanced(WITH_STATIC_LASZIP)
 
-if (WITH_LASZIP)
-    find_package(LASzip 2.0.1)
-
-    if(LASZIP_FOUND)    
-        set(CMAKE_REQUIRED_LIBRARIES ${LASZIP_LIBRARY})
-        include_directories(${LASZIP_INCLUDE_DIR})
-        add_definitions(-DHAVE_LASZIP=1)
-        mark_as_advanced(CLEAR LASZIP_INCLUDE_DIR) 
-        mark_as_advanced(CLEAR LASZIP_LIBRARY) 
-        mark_as_advanced(CLEAR LASZIP_VERSION) 
-    endif()
+find_package(LASzip 2.0.1)
+if(LASZIP_FOUND)    
+    set(CMAKE_REQUIRED_LIBRARIES ${LASZIP_LIBRARY})
+    include_directories(${LASZIP_INCLUDE_DIR})
+    add_definitions(-DHAVE_LASZIP=1)
+    mark_as_advanced(CLEAR LASZIP_INCLUDE_DIR) 
+    mark_as_advanced(CLEAR LASZIP_LIBRARY) 
+    mark_as_advanced(CLEAR LASZIP_VERSION) 
+    set(WITH_LASZIP TRUE)
 endif()
 
 # GDAL/OGR support - optional, default=OFF

diff --git a/apps/bigfile_boost_iostreams_test.cpp b/apps/bigfile_boost_iostreams_test.cpp
@@ -38,9 +38,9 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
  * OF SUCH DAMAGE.
  ****************************************************************************/
-#include <liblas/laspoint.hpp>
-#include <liblas/lasreader.hpp>
-#include <liblas/laswriter.hpp>
+#include <liblas/point.hpp>
+#include <liblas/reader.hpp>
+#include <liblas/writer.hpp>
 #ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable: 4702)
@@ -50,7 +50,7 @@
 #include <boost/iostreams/stream.hpp>
 #ifdef _MSC_VER
 #  pragma warning(pop)
-#endif()
+#endif
 #include <cassert>
 #include <exception>
 #include <iostream>
@@ -82,7 +82,7 @@ int main()
             las::Header header;
             las::Writer writer(bigofs, header);
 
-            las::Point empty_point;
+            las::Point empty_point(&las::DefaultHeader::get());
             bio::stream_offset i = 0;
             for (i = 0; i < point_count; ++i)
             {

diff --git a/python/tests/Header.txt b/python/tests/Header.txt
@@ -48,7 +48,7 @@
   datetime.datetime(2008, 3, 19, 0, 0)
 
   >>> h.software_id
-  'libLAS 1.7.0'
+  'libLAS 1.8.0'
   >>> h.software_id = 'hobu'
   >>> h.software_id
   'hobu'

diff --git a/src/c_api.cpp b/src/c_api.cpp
@@ -531,8 +531,7 @@ LAS_DLL LASHeaderH LASHeader_Create(void) {
 }
 
 LAS_DLL LASPointH LASPoint_Create(void) {
-        // return (LASPointH) new liblas::Point();
-        return 0;
+        return (LASPointH) new liblas::Point(&liblas::DefaultHeader::get());
 }
 
 LAS_DLL LASPointH LASPoint_Copy(const LASPointH hPoint) {

diff --git a/src/detail/reader/zipreader.cpp b/src/detail/reader/zipreader.cpp
@@ -68,8 +68,8 @@ ZipReaderImpl::ZipReaderImpl(std::istream& ifs)
     , m_size(0)
     , m_current(0)
     , m_header_reader(new reader::Header(m_ifs))
-    , m_header(HeaderPtr())
-    , m_point(PointPtr(new liblas::Point()))
+    , m_header(HeaderPtr(new liblas::Header(DefaultHeader::get())))
+    , m_point(PointPtr(new liblas::Point(m_header.get())))
     , m_filters(0)
     , m_transforms(0)
     , bNeedHeaderCheck(false)

diff --git a/test/unit/zipwriter_test.cpp b/test/unit/zipwriter_test.cpp
@@ -80,7 +80,7 @@ namespace tut
 
             liblas::Writer writer(ofs, header);
 
-            liblas::Point point;
+            liblas::Point point(&writer.GetHeader());
 
             // Write 1st point
             point.SetCoordinates(10, 20, 30);
@@ -196,7 +196,7 @@ namespace tut
 
             liblas::Writer writer(ofs, header);
 
-            liblas::Point point;
+            liblas::Point point(&writer.GetHeader());
 
             // Write 1st point
             point.SetCoordinates(10, 20, 30);
@@ -234,7 +234,7 @@ namespace tut
 
             ensure_equals(reader.GetHeader().Compressed(), true);
 
-            liblas::Point point; // reusable cache
+            liblas::Point point(&reader.GetHeader()); // reusable cache
 
             // read 1st point
             bool ok = reader.ReadNextPoint();