Merge remote-tracking branch 'origin/master'

PDAL · Mar 23, 2018 · a526df5 · a526df5
2 parents 837ba6a + 62e6406
commit a526df5
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 321 deletions.
diff --git a/cmake/laszip.cmake b/cmake/laszip.cmake
@@ -5,7 +5,7 @@ option(WITH_LASZIP "Choose if LASzip support should be built" TRUE)
 option(WITH_STATIC_LASZIP "Choose if LASzip should be statically linked" FALSE)
 mark_as_advanced(WITH_STATIC_LASZIP)
 if (WITH_LASZIP)
-    find_package(LASzip QUIET 3.1.1)
+    find_package(LASzip QUIET 3.1)
     set_package_properties(LASzip PROPERTIES TYPE RECOMMENDED
         PURPOSE "Provides LASzip compression")
     if(LASZIP_FOUND)

diff --git a/cmake/modules/FindLASzip.cmake b/cmake/modules/FindLASzip.cmake
@@ -25,7 +25,7 @@ IF(LASZIP_INCLUDE_DIR)
 ENDIF()
 
 IF(WIN32)
-  SET(OSGEO4W_IMPORT_LIBRARY laszip)
+  SET(OSGEO4W_IMPORT_LIBRARY laszip3)
   IF(DEFINED ENV{OSGEO4W_ROOT})
     SET(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
     #MESSAGE(STATUS " FindLASzip: trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")

diff --git a/doc/stages/filters.computerange.rst b/doc/stages/filters.computerange.rst
diff --git a/filters/ComputeRangeFilter.cpp b/filters/ComputeRangeFilter.cpp
diff --git a/filters/ComputeRangeFilter.hpp b/filters/ComputeRangeFilter.hpp
diff --git a/io/TextReader.cpp b/io/TextReader.cpp
@@ -90,6 +90,7 @@ QuickInfo TextReader::inspect()
 
 void TextReader::checkHeader(const std::string& header)
 {
+    std::cerr << "Header = " << header << "!\n";
     auto it = std::find_if(header.begin(), header.end(),
         [](char c){ return std::isalpha(c); });
     if (it == header.end())
@@ -130,6 +131,7 @@ void TextReader::initialize(PointTableRef table)
     if (!m_istream)
         throwError("Unable to open text file '" + m_filename + "'.");
 
+    m_line = 0;
     // Skip lines requested.
     std::string dummy;
     for (size_t i = 0; i < m_skip; ++i)

diff --git a/pdal/FlexWriter.hpp b/pdal/FlexWriter.hpp
@@ -105,7 +105,11 @@ class PDAL_DLL FlexWriter : public Writer
     virtual void write(const PointViewPtr view) final
     {
         if (m_hashPos != std::string::npos)
+        {
+            if (view->size() == 0)
+                return;
             readyFile(generateFilename(), view->spatialReference());
+        }
         writeView(view);
         if (m_hashPos != std::string::npos)
             doneFile();

diff --git a/plugins/nitf/io/tre_plugins.hpp b/plugins/nitf/io/tre_plugins.hpp
@@ -39,7 +39,15 @@
 #ifndef IMPORT_NITRO_API
 #define IMPORT_NITRO_API
 #endif
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wunused-private-field"
+
 #include <nitro/c++/import/nitf.hpp>
+
+#pragma GCC diagnostic pop
+
 #include <nitro/c++/except/Trace.h>
 
 namespace pdal

diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
@@ -108,7 +108,6 @@ PDAL_ADD_TEST(pdal_filters_colorinterp_test FILES
     filters/ColorinterpFilterTest.cpp)
 PDAL_ADD_TEST(pdal_filters_colorization_test FILES
     filters/ColorizationFilterTest.cpp)
-PDAL_ADD_TEST(pdal_filters_computerange_test FILES filters/ComputeRangeFilterTest.cpp)
 PDAL_ADD_TEST(pdal_filters_crop_test FILES filters/CropFilterTest.cpp)
 PDAL_ADD_TEST(pdal_filters_decimation_test FILES
     filters/DecimationFilterTest.cpp)

diff --git a/test/unit/filters/ComputeRangeFilterTest.cpp b/test/unit/filters/ComputeRangeFilterTest.cpp