Merge remote-tracking branch 'rouault/use_geos_reentrant_api'

Conflicts:
	src/core/pal/layer.cpp
	src/core/qgsgeometry.cpp
	src/core/qgspallabeling.cpp

Author: wonder-sk

cmake/FindGEOS.cmake

@@ -84,9 +84,9 @@ ELSE(WIN32)
         STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GEOS_VERSION_MAJOR "${GEOS_VERSION}")
         STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GEOS_VERSION_MINOR "${GEOS_VERSION}")
 
-        IF (GEOS_VERSION_MAJOR LESS 3)
-          MESSAGE (FATAL_ERROR "GEOS version is too old (${GEOS_VERSION}). Use 3.0.0 or higher.")
-        ENDIF (GEOS_VERSION_MAJOR LESS 3)
+        IF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 1) )
+          MESSAGE (FATAL_ERROR "GEOS version is too old (${GEOS_VERSION}). Use 3.1.0 or higher.")
+        ENDIF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 1) )
 
         # set INCLUDE_DIR to prefix+include
         EXEC_PROGRAM(${GEOS_CONFIG}

src/analysis/vector/qgsgeometryanalyzer.cpp

@@ -1100,36 +1100,37 @@ bool QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry*
 
   QList<GEOSGeometry*> outputGeomList;
   QList<QgsGeometry*>::const_iterator inputGeomIt = inputGeomList.constBegin();
+  GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
   for ( ; inputGeomIt != inputGeomList.constEnd(); ++inputGeomIt )
   {
     if ( geom->type() == QGis::Line )
     {
       //geos 3.3 needed for line offsets
 #if defined(GEOS_VERSION_MAJOR) && defined(GEOS_VERSION_MINOR) && \
       ((GEOS_VERSION_MAJOR>3) || ((GEOS_VERSION_MAJOR==3) && (GEOS_VERSION_MINOR>=3)))
-      GEOSGeometry* offsetGeom = GEOSOffsetCurve(( *inputGeomIt )->asGeos(), -offset, 8 /*quadSegments*/, 0 /*joinStyle*/, 5.0 /*mitreLimit*/ );
-      if ( !offsetGeom || !GEOSisValid( offsetGeom ) )
+      GEOSGeometry* offsetGeom = GEOSOffsetCurve_r(geosctxt, ( *inputGeomIt )->asGeos(), -offset, 8 /*quadSegments*/, 0 /*joinStyle*/, 5.0 /*mitreLimit*/ );
+      if ( !offsetGeom || !GEOSisValid_r(geosctxt, offsetGeom ) )
       {
         return false;
       }
-      if ( !GEOSisValid( offsetGeom ) || GEOSGeomTypeId( offsetGeom ) != GEOS_LINESTRING || GEOSGeomGetNumPoints( offsetGeom ) < 1 )
+      if ( !GEOSisValid_r(geosctxt, offsetGeom ) || GEOSGeomTypeId_r(geosctxt, offsetGeom ) != GEOS_LINESTRING || GEOSGeomGetNumPoints_r(geosctxt, offsetGeom ) < 1 )
       {
-        GEOSGeom_destroy( offsetGeom );
+        GEOSGeom_destroy_r(geosctxt, offsetGeom );
         return false;
       }
       outputGeomList.push_back( offsetGeom );
 #else
-      outputGeomList.push_back( GEOSGeom_clone(( *inputGeomIt )->asGeos() ) );
+      outputGeomList.push_back( GEOSGeom_clone_r(geosctxt, ( *inputGeomIt )->asGeos() ) );
 #endif
     }
     else if ( geom->type() == QGis::Point )
     {
       QgsPoint p = ( *inputGeomIt )->asPoint();
       p = createPointOffset( p.x(), p.y(), offset, lineGeom );
-      GEOSCoordSequence* ptSeq = GEOSCoordSeq_create( 1, 2 );
-      GEOSCoordSeq_setX( ptSeq, 0, p.x() );
-      GEOSCoordSeq_setY( ptSeq, 0, p.y() );
-      GEOSGeometry* geosPt = GEOSGeom_createPoint( ptSeq );
+      GEOSCoordSequence* ptSeq = GEOSCoordSeq_create_r(geosctxt, 1, 2 );
+      GEOSCoordSeq_setX_r(geosctxt, ptSeq, 0, p.x() );
+      GEOSCoordSeq_setY_r(geosctxt, ptSeq, 0, p.y() );
+      GEOSGeometry* geosPt = GEOSGeom_createPoint_r(geosctxt, ptSeq );
       outputGeomList.push_back( geosPt );
     }
   }
@@ -1152,11 +1153,11 @@ bool QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry*
     GEOSGeometry* collection = 0;
     if ( geom->type() == QGis::Point )
     {
-      collection = GEOSGeom_createCollection( GEOS_MULTIPOINT, geomArray, outputGeomList.size() );
+      collection = GEOSGeom_createCollection_r(geosctxt, GEOS_MULTIPOINT, geomArray, outputGeomList.size() );
     }
     else if ( geom->type() == QGis::Line )
     {
-      collection = GEOSGeom_createCollection( GEOS_MULTILINESTRING, geomArray, outputGeomList.size() );
+      collection = GEOSGeom_createCollection_r(geosctxt, GEOS_MULTILINESTRING, geomArray, outputGeomList.size() );
     }
     geom->fromGeos( collection );
     delete[] geomArray;

src/analysis/vector/qgszonalstatistics.cpp

@@ -281,7 +281,8 @@ void QgsZonalStatistics::statisticsFromMiddlePointTest( void* band, QgsGeometry*
     return;
   }
 
-  const GEOSPreparedGeometry* polyGeosPrepared = GEOSPrepare( poly->asGeos() );
+  GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
+  const GEOSPreparedGeometry* polyGeosPrepared = GEOSPrepare_r( geosctxt, poly->asGeos() );
   if ( !polyGeosPrepared )
   {
     return;
@@ -300,15 +301,15 @@ void QgsZonalStatistics::statisticsFromMiddlePointTest( void* band, QgsGeometry*
     cellCenterX = rasterBBox.xMinimum() + pixelOffsetX * cellSizeX + cellSizeX / 2;
     for ( int j = 0; j < nCellsX; ++j )
     {
-      GEOSGeom_destroy( currentCellCenter );
-      cellCenterCoords = GEOSCoordSeq_create( 1, 2 );
-      GEOSCoordSeq_setX( cellCenterCoords, 0, cellCenterX );
-      GEOSCoordSeq_setY( cellCenterCoords, 0, cellCenterY );
-      currentCellCenter = GEOSGeom_createPoint( cellCenterCoords );
+      GEOSGeom_destroy_r( geosctxt, currentCellCenter );
+      cellCenterCoords = GEOSCoordSeq_create_r( geosctxt, 1, 2 );
+      GEOSCoordSeq_setX_r( geosctxt, cellCenterCoords, 0, cellCenterX );
+      GEOSCoordSeq_setY_r( geosctxt, cellCenterCoords, 0, cellCenterY );
+      currentCellCenter = GEOSGeom_createPoint_r( geosctxt, cellCenterCoords );
 
       if ( scanLine[j] != mInputNodataValue ) //don't consider nodata values
       {
-        if ( GEOSPreparedContains( polyGeosPrepared, currentCellCenter ) )
+        if ( GEOSPreparedContains_r( geosctxt, polyGeosPrepared, currentCellCenter ) )
         {
           if ( !qIsNaN( scanLine[j] ) )
           {
@@ -322,7 +323,7 @@ void QgsZonalStatistics::statisticsFromMiddlePointTest( void* band, QgsGeometry*
     cellCenterY -= cellSizeY;
   }
   CPLFree( scanLine );
-  GEOSPreparedGeom_destroy( polyGeosPrepared );
+  GEOSPreparedGeom_destroy_r( geosctxt, polyGeosPrepared );
 }
 
 void QgsZonalStatistics::statisticsFromPreciseIntersection( void* band, QgsGeometry* poly, int pixelOffsetX,

src/app/qgsmaptooloffsetcurve.cpp

@@ -367,7 +367,7 @@ void QgsMapToolOffsetCurve::setOffsetForRubberBand( double offset, bool leftSide
     int quadSegments = s.value( "/qgis/digitizing/offset_quad_seg", 8 ).toInt();
     double mitreLimit = s.value( "/qgis/digitizing/offset_miter_limit", 5.0 ).toDouble();
 
-    GEOSGeometry* offsetGeom = GEOSOffsetCurve( geosGeom, leftSide ? offset : -offset, quadSegments, joinStyle, mitreLimit );
+    GEOSGeometry* offsetGeom = GEOSOffsetCurve_r( QgsGeometry::getGEOSHandler(), geosGeom, leftSide ? offset : -offset, quadSegments, joinStyle, mitreLimit );
     if ( !offsetGeom )
     {
       deleteRubberBandAndGeometry();

src/core/pal/feature.cpp

@@ -39,6 +39,7 @@
 #endif
 
 #include <qglobal.h>
+#include <qgsgeometry.h>
 
 #include <cmath>
 #include <cstring>
@@ -109,7 +110,7 @@ namespace pal
 
     if ( ownsGeom )
     {
-      GEOSGeom_destroy( the_geom );
+      GEOSGeom_destroy_r( QgsGeometry::getGEOSHandler(), the_geom );
       the_geom = NULL;
     }
   }
@@ -123,36 +124,37 @@ namespace pal
     int i, j;
 
     const GEOSCoordSequence *coordSeq;
+    GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
 
-    type = GEOSGeomTypeId( geom );
+    type = GEOSGeomTypeId_r( geosctxt, geom );
 
     if ( type == GEOS_POLYGON )
     {
-      if ( GEOSGetNumInteriorRings( geom ) > 0 )
+      if ( GEOSGetNumInteriorRings_r( geosctxt, geom ) > 0 )
       {
         // set nbHoles, holes member variables
-        nbHoles = GEOSGetNumInteriorRings( geom );
+        nbHoles = GEOSGetNumInteriorRings_r( geosctxt, geom );
         holes = new PointSet*[nbHoles];
 
         for ( i = 0; i < nbHoles; i++ )
         {
           holes[i] = new PointSet();
           holes[i]->holeOf = NULL;
 
-          const GEOSGeometry* interior =  GEOSGetInteriorRingN( geom, i );
-          holes[i]->nbPoints = GEOSGetNumCoordinates( interior );
+          const GEOSGeometry* interior =  GEOSGetInteriorRingN_r( geosctxt, geom, i );
+          holes[i]->nbPoints = GEOSGetNumCoordinates_r( geosctxt, interior );
           holes[i]->x = new double[holes[i]->nbPoints];
           holes[i]->y = new double[holes[i]->nbPoints];
 
           holes[i]->xmin = holes[i]->ymin = DBL_MAX;
           holes[i]->xmax = holes[i]->ymax = -DBL_MAX;
 
-          coordSeq = GEOSGeom_getCoordSeq( interior );
+          coordSeq = GEOSGeom_getCoordSeq_r( geosctxt, interior );
 
           for ( j = 0; j < holes[i]->nbPoints; j++ )
           {
-            GEOSCoordSeq_getX( coordSeq, j, &holes[i]->x[j] );
-            GEOSCoordSeq_getY( coordSeq, j, &holes[i]->y[j] );
+            GEOSCoordSeq_getX_r( geosctxt, coordSeq, j, &holes[i]->x[j] );
+            GEOSCoordSeq_getY_r( geosctxt, coordSeq, j, &holes[i]->y[j] );
 
             holes[i]->xmax = holes[i]->x[j] > holes[i]->xmax ? holes[i]->x[j] : holes[i]->xmax;
             holes[i]->xmin = holes[i]->x[j] < holes[i]->xmin ? holes[i]->x[j] : holes[i]->xmin;
@@ -166,7 +168,7 @@ namespace pal
       }
 
       // use exterior ring for the extraction of coordinates that follows
-      geom = GEOSGetExteriorRing( geom );
+      geom = GEOSGetExteriorRing_r( geosctxt, geom );
     }
     else
     {
@@ -175,8 +177,8 @@ namespace pal
     }
 
     // find out number of points
-    nbPoints = GEOSGetNumCoordinates( geom );
-    coordSeq = GEOSGeom_getCoordSeq( geom );
+    nbPoints = GEOSGetNumCoordinates_r( geosctxt, geom );
+    coordSeq = GEOSGeom_getCoordSeq_r( geosctxt, geom );
 
     // initialize bounding box
     xmin = ymin = DBL_MAX;
@@ -188,8 +190,8 @@ namespace pal
 
     for ( i = 0; i < nbPoints; i++ )
     {
-      GEOSCoordSeq_getX( coordSeq, i, &x[i] );
-      GEOSCoordSeq_getY( coordSeq, i, &y[i] );
+      GEOSCoordSeq_getX_r( geosctxt, coordSeq, i, &x[i] );
+      GEOSCoordSeq_getY_r( geosctxt, coordSeq, i, &y[i] );
 
       xmax = x[i] > xmax ? x[i] : xmax;
       xmin = x[i] < xmin ? x[i] : xmin;
@@ -1397,13 +1399,14 @@ namespace pal
 
   void FeaturePart::addSizePenalty( int nbp, LabelPosition** lPos, double bbx[4], double bby[4] )
   {
-    int geomType = GEOSGeomTypeId( the_geom );
+    GEOSContextHandle_t ctxt = QgsGeometry::getGEOSHandler();
+    int geomType = GEOSGeomTypeId_r( ctxt, the_geom );
 
     double sizeCost = 0;
     if ( geomType == GEOS_LINESTRING )
     {
       double length;
-      if ( GEOSLength( the_geom, &length ) != 1 )
+      if ( GEOSLength_r( ctxt, the_geom, &length ) != 1 )
         return; // failed to calculate length
       double bbox_length = max( bbx[2] - bbx[0], bby[2] - bby[0] );
       if ( length >= bbox_length / 4 )
@@ -1414,7 +1417,7 @@ namespace pal
     else if ( geomType == GEOS_POLYGON )
     {
       double area;
-      if ( GEOSArea( the_geom, &area ) != 1 )
+      if ( GEOSArea_r( ctxt, the_geom, &area ) != 1 )
         return;
       double bbox_area = ( bbx[2] - bbx[0] ) * ( bby[2] - bby[0] );
       if ( area >= bbox_area / 16 )
@@ -1436,27 +1439,28 @@ namespace pal
 
   bool FeaturePart::isConnected( FeaturePart* p2 )
   {
-    return ( GEOSTouches( the_geom, p2->the_geom ) == 1 );
+    return ( GEOSTouches_r( QgsGeometry::getGEOSHandler(), the_geom, p2->the_geom ) == 1 );
   }
 
   bool FeaturePart::mergeWithFeaturePart( FeaturePart* other )
   {
-    GEOSGeometry* g1 = GEOSGeom_clone( the_geom );
-    GEOSGeometry* g2 = GEOSGeom_clone( other->the_geom );
+    GEOSContextHandle_t ctxt = QgsGeometry::getGEOSHandler();
+    GEOSGeometry* g1 = GEOSGeom_clone_r( ctxt, the_geom );
+    GEOSGeometry* g2 = GEOSGeom_clone_r( ctxt, other->the_geom );
     GEOSGeometry* geoms[2] = { g1, g2 };
-    GEOSGeometry* g = GEOSGeom_createCollection( GEOS_MULTILINESTRING, geoms, 2 );
-    GEOSGeometry* gTmp = GEOSLineMerge( g );
-    GEOSGeom_destroy( g );
+    GEOSGeometry* g = GEOSGeom_createCollection_r( ctxt, GEOS_MULTILINESTRING, geoms, 2 );
+    GEOSGeometry* gTmp = GEOSLineMerge_r( ctxt, g );
+    GEOSGeom_destroy_r( ctxt, g );
 
-    if ( GEOSGeomTypeId( gTmp ) != GEOS_LINESTRING )
+    if ( GEOSGeomTypeId_r( ctxt, gTmp ) != GEOS_LINESTRING )
     {
       // sometimes it's not possible to merge lines (e.g. they don't touch at endpoints)
-      GEOSGeom_destroy( gTmp );
+      GEOSGeom_destroy_r( ctxt, gTmp );
       return false;
     }
 
     if ( ownsGeom ) // delete old geometry if we own it
-      GEOSGeom_destroy( the_geom );
+      GEOSGeom_destroy_r( ctxt, the_geom );
     // set up new geometry
     the_geom = gTmp;
     ownsGeom = true;

src/core/pal/layer.cpp

@@ -41,6 +41,7 @@
 #include <cmath>
 #include <vector>
 
+#include <qgsgeometry.h>
 
 #include <pal/pal.h>
 #include <pal/layer.h>
@@ -286,18 +287,20 @@ namespace pal
       throw InternalException::UnknownGeometry();
     }
 
+    GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
+
     while ( simpleGeometries->size() > 0 )
     {
       const GEOSGeometry* geom = simpleGeometries->pop_front();
 
       // ignore invalid geometries (e.g. polygons with self-intersecting rings)
-      if ( GEOSisValid( geom ) != 1 ) // 0=invalid, 1=valid, 2=exception
+      if ( GEOSisValid_r( geosctxt, geom ) != 1 ) // 0=invalid, 1=valid, 2=exception
       {
         std::cerr << "ignoring invalid feature " << geom_id << std::endl;
         continue;
       }
 
-      int type = GEOSGeomTypeId( geom );
+      int type = GEOSGeomTypeId_r( geosctxt, geom );
 
       if ( type != GEOS_POINT && type != GEOS_LINESTRING && type != GEOS_POLYGON )
       {
@@ -325,9 +328,9 @@ namespace pal
       if ( mode == LabelPerFeature && ( type == GEOS_POLYGON || type == GEOS_LINESTRING ) )
       {
         if ( type == GEOS_LINESTRING )
-          GEOSLength( geom, &geom_size );
+          GEOSLength_r( geosctxt, geom, &geom_size );
         else if ( type == GEOS_POLYGON )
-          GEOSArea( geom, &geom_size );
+          GEOSArea_r( geosctxt, geom, &geom_size );
 
         if ( geom_size > biggest_size )
         {
@@ -493,30 +496,31 @@ namespace pal
 
   void Layer::chopFeaturesAtRepeatDistance( )
   {
+    GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
     LinkedList<FeaturePart*> * newFeatureParts = new LinkedList<FeaturePart*>( ptrFeaturePartCompare );
     while ( FeaturePart* fpart = featureParts->pop_front() )
     {
       const GEOSGeometry* geom = fpart->getGeometry();
       double chopInterval = fpart->getFeature()->repeatDistance();
-      if ( chopInterval != 0. && GEOSGeomTypeId( geom ) == GEOS_LINESTRING )
+      if ( chopInterval != 0. && GEOSGeomTypeId_r( geosctxt, geom ) == GEOS_LINESTRING )
       {
 
         double bmin[2], bmax[2];
         fpart->getBoundingBox( bmin, bmax );
         rtree->Remove( bmin, bmax, fpart );
 
-        const GEOSCoordSequence *cs = GEOSGeom_getCoordSeq( geom );
+        const GEOSCoordSequence *cs = GEOSGeom_getCoordSeq_r( geosctxt, geom );
 
         // get number of points
         unsigned int n;
-        GEOSCoordSeq_getSize( cs, &n );
+        GEOSCoordSeq_getSize_r( geosctxt, cs, &n );
 
         // Read points
         std::vector<Point> points( n );
         for ( unsigned int i = 0; i < n; ++i )
         {
-          GEOSCoordSeq_getX( cs, i, &points[i].x );
-          GEOSCoordSeq_getY( cs, i, &points[i].y );
+          GEOSCoordSeq_getX_r( geosctxt, cs, i, &points[i].x );
+          GEOSCoordSeq_getY_r( geosctxt, cs, i, &points[i].y );
         }
 
         // Cumulative length vector
@@ -548,14 +552,14 @@ namespace pal
           p.x = points[cur - 1].x + c * ( points[cur].x - points[cur - 1].x );
           p.y = points[cur - 1].y + c * ( points[cur].y - points[cur - 1].y );
           part.push_back( p );
-          GEOSCoordSequence* cooSeq = GEOSCoordSeq_create( part.size(), 2 );
+          GEOSCoordSequence* cooSeq = GEOSCoordSeq_create_r( geosctxt, part.size(), 2 );
           for ( std::size_t i = 0; i < part.size(); ++i )
           {
-            GEOSCoordSeq_setX( cooSeq, i, part[i].x );
-            GEOSCoordSeq_setY( cooSeq, i, part[i].y );
+            GEOSCoordSeq_setX_r( geosctxt, cooSeq, i, part[i].x );
+            GEOSCoordSeq_setY_r( geosctxt, cooSeq, i, part[i].y );
           }
 
-          GEOSGeometry* newgeom = GEOSGeom_createLineString( cooSeq );
+          GEOSGeometry* newgeom = GEOSGeom_createLineString_r( geosctxt, cooSeq );
           FeaturePart* newfpart = new FeaturePart( fpart->getFeature(), newgeom );
           newFeatureParts->push_back( newfpart );
           newfpart->getBoundingBox( bmin, bmax );
@@ -565,14 +569,14 @@ namespace pal
         }
         // Create final part
         part.push_back( points[n - 1] );
-        GEOSCoordSequence* cooSeq = GEOSCoordSeq_create( part.size(), 2 );
+        GEOSCoordSequence* cooSeq = GEOSCoordSeq_create_r( geosctxt, part.size(), 2 );
         for ( std::size_t i = 0; i < part.size(); ++i )
         {
-          GEOSCoordSeq_setX( cooSeq, i, part[i].x );
-          GEOSCoordSeq_setY( cooSeq, i, part[i].y );
+          GEOSCoordSeq_setX_r( geosctxt, cooSeq, i, part[i].x );
+          GEOSCoordSeq_setY_r( geosctxt, cooSeq, i, part[i].y );
         }
 
-        GEOSGeometry* newgeom = GEOSGeom_createLineString( cooSeq );
+        GEOSGeometry* newgeom = GEOSGeom_createLineString_r( geosctxt, cooSeq );
         FeaturePart* newfpart = new FeaturePart( fpart->getFeature(), newgeom );
         newFeatureParts->push_back( newfpart );
         newfpart->getBoundingBox( bmin, bmax );