fix build

qgis · Dec 23, 2020 · eb1c7b1a72fb5957ea3aead2cbc83257bfa298b2 · eb1c7b1
1 parent e115483
commit eb1c7b1a72fb5957ea3aead2cbc83257bfa298b2
Unified Split

Showing with 3 additions and 6 deletions.

+1 −1 external/untwine/bu/Processor.cpp

+0 −1 external/untwine/epf/Epf.cpp

+0 −2 external/untwine/epf/Grid.cpp

+2 −2 src/core/geometry/qgscircle.cpp
diff --git a/external/untwine/bu/Processor.cpp b/external/untwine/bu/Processor.cpp
@@ -136,7 +136,7 @@ std::cerr << m_vi.key() << " Accepted/Rejected/num points = " <<
 }
 
 
-bool Processor::acceptable(int pointId, GridKey key)
+bool Processor::acceptable(int /* pointId */, GridKey key)
 {
     VoxelInfo::Grid& grid = m_vi.grid();
 

diff --git a/external/untwine/epf/Epf.cpp b/external/untwine/epf/Epf.cpp
@@ -73,7 +73,6 @@ void Epf::run(const Options& options, ProgressWriter& progress)
 {
     using namespace pdal;
 
-    double millionPoints = 0;
     BOX3D totalBounds;
 
     if (pdal::FileUtils::fileExists(options.tempDir + "/" + MetadataFilename))

diff --git a/external/untwine/epf/Grid.cpp b/external/untwine/epf/Grid.cpp
@@ -42,8 +42,6 @@ int Grid::calcLevel()
 {
     int level = 0;
     double mp = (double)m_millionPoints;
-    double limit = (MaxPointsPerNode / 1000000.0);
-
     double xside = m_bounds.maxx - m_bounds.minx;
     double yside = m_bounds.maxy - m_bounds.miny;
     double zside = m_bounds.maxz - m_bounds.minz;

diff --git a/src/core/geometry/qgscircle.cpp b/src/core/geometry/qgscircle.cpp
@@ -241,7 +241,7 @@ static QVector<QgsCircle> from2ParallelsLine( const QgsPoint &pt1_par1, const Qg
   }
 
   QgsGeometryUtils::segmentIntersection( ptInter_par1line1, ptInter_par1line1.project( 1.0, angle1 + 90.0 ), ptInter_par2line1, ptInter_par2line1.project( 1.0, angle2 ), center, isInter, epsilon, true );
-  if ( isInter and not circles.contains( QgsCircle( center, radius ) ) )
+  if ( isInter && !circles.contains( QgsCircle( center, radius ) ) )
   {
     if ( !pos.isEmpty() )
     {
@@ -256,7 +256,7 @@ static QVector<QgsCircle> from2ParallelsLine( const QgsPoint &pt1_par1, const Qg
     }
   }
   QgsGeometryUtils::segmentIntersection( ptInter_par1line1, ptInter_par1line1.project( 1.0, angle1 + 90.0 ), ptInter_par2line1, ptInter_par2line1.project( 1.0, angle2 + 90.0 ), center, isInter, epsilon, true );
-  if ( isInter and not circles.contains( QgsCircle( center, radius ) ) )
+  if ( isInter && !circles.contains( QgsCircle( center, radius ) ) )
   {
     if ( !pos.isEmpty() )
     {