Fix warnings in pdal wrench

qgis · Apr 9, 2023 · 3342172 · 3342172
1 parent e98e655
commit 3342172
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 22 deletions.
diff --git a/external/pdal_wrench/alg.cpp b/external/pdal_wrench/alg.cpp
@@ -86,7 +86,7 @@ bool Alg::parseArgs(std::vector<std::string> args)
         argInput = &programArgs.add("input,i", "Input point cloud file", inputFile);
     }
 
-    pdal::Arg& argFilter = programArgs.add("filter,f", "Filter expression for input data", filterExpression);
+    (void)programArgs.add("filter,f", "Filter expression for input data", filterExpression);
 
     addArgs();  // impl in derived
 

diff --git a/external/pdal_wrench/alg.hpp b/external/pdal_wrench/alg.hpp
@@ -50,6 +50,7 @@ struct Alg
     pdal::ProgramArgs programArgs;
 
     Alg() = default;
+    virtual ~Alg() = default;
 
     // no copying
     Alg(const Alg &other) = delete;
@@ -75,7 +76,7 @@ struct Alg
     /**
      * Runs and post-processing code when pipelines are done executing.
      */
-    virtual void finalize(std::vector<std::unique_ptr<PipelineManager>>& pipelines) {};
+    virtual void finalize(std::vector<std::unique_ptr<PipelineManager>>& pipelines) { ( void )pipelines; };
 };
 
 bool runAlg(std::vector<std::string> args, Alg &alg);

diff --git a/external/pdal_wrench/boundary.cpp b/external/pdal_wrench/boundary.cpp
@@ -84,11 +84,11 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, double r
         hexbin_opts.add(pdal::Option("where", tile->filterExpression));
     }
 
-    Stage& w = manager->makeFilter( "filters.hexbin", r, hexbin_opts );
+    (void)manager->makeFilter( "filters.hexbin", r, hexbin_opts );
     return manager;
 }
 
-void Boundary::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &bounds, point_count_t &totalPoints)
+void Boundary::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &, point_count_t &)
 {
     if (ends_with(inputFile, ".vpc"))
     {

diff --git a/external/pdal_wrench/clip.cpp b/external/pdal_wrench/clip.cpp
@@ -137,7 +137,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, const pd
 }
 
 
-void Clip::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &bounds, point_count_t &totalPoints)
+void Clip::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &, point_count_t &totalPoints)
 {
     pdal::Options crop_opts;
     BOX2D bbox;
@@ -197,7 +197,7 @@ void Clip::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipel
     }
 }
 
-void Clip::finalize(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
+void Clip::finalize(std::vector<std::unique_ptr<PipelineManager>>&)
 {
     if (tileOutputFiles.empty())
         return;

diff --git a/external/pdal_wrench/density.cpp b/external/pdal_wrench/density.cpp
@@ -117,7 +117,7 @@ std::unique_ptr<PipelineManager> Density::pipeline(ParallelJobInfo *tile) const
     // TODO: "writers.gdal: Requested driver 'COG' does not support file creation.""
     //   writer_opts.add(pdal::Option("gdaldriver", "COG"));
 
-    pdal::StageCreationOptions opts{ tile->outputFilename, "", nullptr, writer_opts };
+    pdal::StageCreationOptions opts{ tile->outputFilename, "", nullptr, writer_opts, nullptr };
     Stage& w = manager->makeWriter( opts );
     for (Stage *stage : readers)
     {

diff --git a/external/pdal_wrench/info.cpp b/external/pdal_wrench/info.cpp
@@ -101,7 +101,7 @@ static void formatCrsInfo(const std::string &crsWkt, std::string &crs, std::stri
 }
 
 
-void Info::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &bounds, point_count_t &totalPoints)
+void Info::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>&, const BOX3D &, point_count_t &)
 {
     if (ends_with(inputFile, ".vpc"))
     {
@@ -180,6 +180,6 @@ void Info::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipel
     }
 }
 
-void Info::finalize(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
+void Info::finalize(std::vector<std::unique_ptr<PipelineManager>>&)
 {
 }
diff --git a/external/pdal_wrench/merge.cpp b/external/pdal_wrench/merge.cpp
@@ -73,7 +73,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile)
     return manager;
 }
 
-void Merge::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &bounds, point_count_t &totalPoints)
+void Merge::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &, point_count_t &totalPoints)
 {
     ParallelJobInfo tile(ParallelJobInfo::Single, BOX2D(), filterExpression);
     tile.inputFilenames = inputFiles;

diff --git a/external/pdal_wrench/thin.cpp b/external/pdal_wrench/thin.cpp
@@ -131,7 +131,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, std::str
 }
 
 
-void Thin::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &bounds, point_count_t &totalPoints)
+void Thin::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &, point_count_t &)
 {
     if (ends_with(inputFile, ".vpc"))
     {
@@ -175,7 +175,7 @@ void Thin::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipel
     }
 }
 
-void Thin::finalize(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
+void Thin::finalize(std::vector<std::unique_ptr<PipelineManager>>&)
 {
     if (tileOutputFiles.empty())
         return;

diff --git a/external/pdal_wrench/tile/TileGrid.cpp b/external/pdal_wrench/tile/TileGrid.cpp
@@ -37,6 +37,7 @@ void TileGrid::expand(const BOX3D& bounds, size_t points)
 
 TileKey TileGrid::key(double x, double y, double z) const
 {
+    (void)z;
     int xi = (int)std::floor((x - m_bounds.minx) / m_tileLength);
     int yi = (int)std::floor((y - m_bounds.miny) / m_tileLength);
     xi = (std::min)((std::max)(0, xi), m_gridSizeX - 1);

diff --git a/external/pdal_wrench/tile/tile.cpp b/external/pdal_wrench/tile/tile.cpp
@@ -622,6 +622,9 @@ static void tilingPass1(BaseInfo &m_b, TileGrid &m_grid, FileInfo &m_srsFileInfo
 
 static void tilingPass2(BaseInfo &m_b, TileGrid &m_grid, FileInfo &m_srsFileInfo)
 {
+  (void)m_grid;
+  (void)m_srsFileInfo;
+
   //---------
   // pass 2: write the final LAS/LAZ tiles
 
@@ -661,7 +664,7 @@ static void tilingPass2(BaseInfo &m_b, TileGrid &m_grid, FileInfo &m_srsFileInfo
 
           PointViewPtr view(new pdal::PointView(table));
 
-          int ptCnt = 0;
+          std::size_t ptCnt = 0;
           std::ifstream fileReader(binFile,std::ios::binary|std::ios::ate);
           if (!fileReader)
           {
@@ -681,7 +684,7 @@ static void tilingPass2(BaseInfo &m_b, TileGrid &m_grid, FileInfo &m_srsFileInfo
           {
               size_t nPointsToRead = std::min(readChunkSize, ptCnt-i);
               fileReader.read(contentPtr, nPointsToRead*m_b.pointSize);
-              for (int a = 0; a < nPointsToRead; ++a)
+              for (size_t a = 0; a < nPointsToRead; ++a)
               {
                   char *base = contentPtr + a * m_b.pointSize;
                   for (const untwine::FileDimInfo& fdi : dims)

diff --git a/external/pdal_wrench/to_raster.cpp b/external/pdal_wrench/to_raster.cpp
@@ -128,7 +128,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, double r
     // TODO: "writers.gdal: Requested driver 'COG' does not support file creation.""
     //   writer_opts.add(pdal::Option("gdaldriver", "COG"));
 
-    pdal::StageCreationOptions opts{ tile->outputFilename, "", nullptr, writer_opts };
+    pdal::StageCreationOptions opts{ tile->outputFilename, "", nullptr, writer_opts, nullptr };
     Stage& w = manager->makeWriter( opts );
     for (Stage *stage : readers)
     {

diff --git a/external/pdal_wrench/to_raster_tin.cpp b/external/pdal_wrench/to_raster_tin.cpp
@@ -126,7 +126,7 @@ std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, double resoluti
     writer_opts.add(pdal::Option("data_type", "float32"));  // default was float64 which seems like too much
     writer_opts.add(pdal::Option("gdalopts", "TILED=YES"));
     writer_opts.add(pdal::Option("gdalopts", "COMPRESS=DEFLATE"));
-    Stage &w = manager->makeWriter(tile->outputFilename, "writers.raster", faceRaster);
+    (void)manager->makeWriter(tile->outputFilename, "writers.raster", faceRaster);
 
     return manager;
 }

diff --git a/external/pdal_wrench/to_vector.cpp b/external/pdal_wrench/to_vector.cpp
@@ -65,13 +65,13 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, const st
         writer_opts.add(pdal::Option("where", tile->filterExpression));
     }
 
-    Stage& w = manager->makeWriter( tile->outputFilename, "writers.ogr", r, writer_opts);
+    (void)manager->makeWriter( tile->outputFilename, "writers.ogr", r, writer_opts);
 
     return manager;
 }
 
 
-void ToVector::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &bounds, point_count_t &totalPoints)
+void ToVector::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &, point_count_t &)
 {
     if (ends_with(inputFile, ".vpc"))
     {
@@ -109,7 +109,7 @@ void ToVector::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& p
     }
 }
 
-void ToVector::finalize(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
+void ToVector::finalize(std::vector<std::unique_ptr<PipelineManager>>&)
 {
     if (tileOutputFiles.empty())
         return;

diff --git a/external/pdal_wrench/translate.cpp b/external/pdal_wrench/translate.cpp
@@ -131,7 +131,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, std::str
 }
 
 
-void Translate::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &bounds, point_count_t &totalPoints)
+void Translate::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipelines, const BOX3D &, point_count_t &)
 {
     if (ends_with(inputFile, ".vpc"))
     {
@@ -175,7 +175,7 @@ void Translate::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>&
     }
 }
 
-void Translate::finalize(std::vector<std::unique_ptr<PipelineManager>>& pipelines)
+void Translate::finalize(std::vector<std::unique_ptr<PipelineManager>>&)
 {
     if (tileOutputFiles.empty())
         return;

diff --git a/external/pdal_wrench/utils.hpp b/external/pdal_wrench/utils.hpp
@@ -155,7 +155,7 @@ struct CRS
     // The returned value remains internal to the OGRSpatialReference
     // and should not be freed, or modified. It may be invalidated on
     // the next OGRSpatialReference call.
-    double u = ptr->GetLinearUnits(&units);
+    (void)ptr->GetLinearUnits(&units);
     std::string tmp(units);
     Utils::trim(tmp);
     return tmp;