Fix build

qgis · Aug 13, 2021 · 34c9bd8 · 34c9bd8
1 parent 1acedba
commit 34c9bd8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/analysis/vector/qgsgeometrysnapper.cpp b/src/analysis/vector/qgsgeometrysnapper.cpp
@@ -209,7 +209,7 @@ void QgsSnapIndex::addPoint( const CoordIdx *idx, bool isEndPoint )
 
   GEOSContextHandle_t geosctxt = QgsGeos::getGEOSHandler();
 #if GEOS_VERSION_MAJOR>3 || GEOS_VERSION_MINOR>=8
-  const geos::unique_ptr point( GEOSGeom_createPointFromXY_r( geosctxt, row, col ) );
+  geos::unique_ptr point( GEOSGeom_createPointFromXY_r( geosctxt, row, col ) );
 #else
   GEOSCoordSequence *seq = GEOSCoordSeq_create_r( geosctxt, 1, 2 );
   GEOSCoordSeq_setX_r( geosctxt, seq, 0, row );
@@ -240,7 +240,7 @@ void QgsSnapIndex::addSegment( const CoordIdx *idxFrom, const CoordIdx *idxTo )
   for ( ; rt.isValid(); rt.next() )
   {
 #if GEOS_VERSION_MAJOR>3 || GEOS_VERSION_MINOR>=8
-    const geos::unique_ptr point( GEOSGeom_createPointFromXY_r( geosctxt, rt.curRow(), rt.curCol() ) );
+    geos::unique_ptr point( GEOSGeom_createPointFromXY_r( geosctxt, rt.curRow(), rt.curCol() ) );
 #else
     GEOSCoordSequence *seq = GEOSCoordSeq_create_r( geosctxt, 1, 2 );
     GEOSCoordSeq_setX_r( geosctxt, seq, 0, rt.curRow() );
@@ -317,7 +317,7 @@ QgsPoint QgsSnapIndex::getClosestSnapToPoint( const QgsPoint &p, const QgsPoint
   for ( ; rt.isValid(); rt.next() )
   {
 #if GEOS_VERSION_MAJOR>3 || GEOS_VERSION_MINOR>=8
-    const geos::unique_ptr searchPoint( GEOSGeom_createPointFromXY_r( geosctxt, rt.curRow(), rt.curCol() ) );
+    geos::unique_ptr searchPoint( GEOSGeom_createPointFromXY_r( geosctxt, rt.curRow(), rt.curCol() ) );
 #else
     GEOSCoordSequence *seq = GEOSCoordSeq_create_r( geosctxt, 1, 2 );
     GEOSCoordSeq_setX_r( geosctxt, seq, 0, rt.curRow() );
@@ -369,7 +369,7 @@ QgsSnapIndex::SnapItem *QgsSnapIndex::getSnapItem( const QgsPoint &pos, double t
   GEOSCoordSeq_setY_r( geosctxt, coord, 1, colEnd );
 #endif
 
-  const geos::unique_ptr searchDiagonal( GEOSGeom_createLineString_r( geosctxt, coord ) );
+  geos::unique_ptr searchDiagonal( GEOSGeom_createLineString_r( geosctxt, coord ) );
 
   QList<SnapItem *> items;
   struct _GEOSQueryCallbackData callbackData;

diff --git a/src/core/pal/geomfunction.cpp b/src/core/pal/geomfunction.cpp
@@ -359,7 +359,7 @@ bool GeomFunction::containsCandidate( const GEOSPreparedGeometry *geom, double x
     GEOSCoordSeq_setY_r( geosctxt, coord, 4, y );
 #endif
 
-    const geos::unique_ptr bboxGeos( GEOSGeom_createLinearRing_r( geosctxt, coord ) );
+    geos::unique_ptr bboxGeos( GEOSGeom_createLinearRing_r( geosctxt, coord ) );
     const bool result = ( GEOSPreparedContainsProperly_r( geosctxt, geom, bboxGeos.get() ) == 1 );
     return result;
   }

diff --git a/src/core/pal/pointset.cpp b/src/core/pal/pointset.cpp
@@ -269,7 +269,7 @@ bool PointSet::containsPoint( double x, double y ) const
   try
   {
 #if GEOS_VERSION_MAJOR>3 || GEOS_VERSION_MINOR>=8
-    const geos::unique_ptr point( GEOSGeom_createPointFromXY_r( geosctxt, x, y ) );
+    geos::unique_ptr point( GEOSGeom_createPointFromXY_r( geosctxt, x, y ) );
 #else
     GEOSCoordSequence *seq = GEOSCoordSeq_create_r( geosctxt, 1, 2 );
     GEOSCoordSeq_setX_r( geosctxt, seq, 0, x );
@@ -862,7 +862,7 @@ double PointSet::minDistanceToPoint( double px, double py, double *rx, double *r
   try
   {
 #if GEOS_VERSION_MAJOR>3 || GEOS_VERSION_MINOR>=8
-    const geos::unique_ptr geosPt( GEOSGeom_createPointFromXY_r( geosctxt, px, py ) );
+    geos::unique_ptr geosPt( GEOSGeom_createPointFromXY_r( geosctxt, px, py ) );
 #else
     GEOSCoordSequence *coord = GEOSCoordSeq_create_r( geosctxt, 1, 2 );
     GEOSCoordSeq_setX_r( geosctxt, coord, 0, px );
@@ -940,7 +940,7 @@ void PointSet::getCentroid( double &px, double &py, bool forceInside ) const
   try
   {
     GEOSContextHandle_t geosctxt = QgsGeos::getGEOSHandler();
-    const geos::unique_ptr centroidGeom( GEOSGetCentroid_r( geosctxt, mGeos ) );
+    geos::unique_ptr centroidGeom( GEOSGetCentroid_r( geosctxt, mGeos ) );
     if ( centroidGeom )
     {
       const GEOSCoordSequence *coordSeq = GEOSGeom_getCoordSeq_r( geosctxt, centroidGeom.get() );
@@ -959,7 +959,7 @@ void PointSet::getCentroid( double &px, double &py, bool forceInside ) const
     // check if centroid inside in polygon
     if ( forceInside && !containsPoint( px, py ) )
     {
-      const geos::unique_ptr pointGeom( GEOSPointOnSurface_r( geosctxt, mGeos ) );
+      geos::unique_ptr pointGeom( GEOSPointOnSurface_r( geosctxt, mGeos ) );
 
       if ( pointGeom )
       {

diff --git a/src/plugins/topology/topolTest.cpp b/src/plugins/topology/topolTest.cpp
@@ -37,7 +37,7 @@
 
 static bool _canExportToGeos( const QgsGeometry &geom )
 {
-  const geos::unique_ptr geosGeom = QgsGeos::asGeos( geom );
+  geos::unique_ptr geosGeom = QgsGeos::asGeos( geom );
   return static_cast<bool>( geosGeom );
 }