[mapguide-commits] r9711 - sandbox/jng/geos_c/Common/Geometry

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-08-14 01:21:30 -0700 (Fri, 14 Aug 2020)
New Revision: 9711

Modified:
   sandbox/jng/geos_c/Common/Geometry/PreparedGeometry.cpp
Log:
Use thread-safe versions of prepared geom C APIs

Modified: sandbox/jng/geos_c/Common/Geometry/PreparedGeometry.cpp
===================================================================
--- sandbox/jng/geos_c/Common/Geometry/PreparedGeometry.cpp	2020-08-12 11:28:23 UTC (rev 9710)
+++ sandbox/jng/geos_c/Common/Geometry/PreparedGeometry.cpp	2020-08-14 08:21:30 UTC (rev 9711)
@@ -44,7 +44,7 @@
     {
         bool bResult = false;
         GEOSGeometry* g = GeometryToGeos(geom);
-        bResult = GEOSPreparedContains(m_pg, g);
+        bResult = GEOSPreparedContains_r(m_hCtx, m_pg, g);
         GEOSGeom_destroy_r(m_hCtx, g);
         return bResult;
     }
@@ -52,7 +52,7 @@
     {
         bool bResult = false;
         GEOSGeometry* g = GeometryToGeos(geom);
-        bResult = GEOSPreparedCrosses(m_pg, g);
+        bResult = GEOSPreparedCrosses_r(m_hCtx, m_pg, g);
         GEOSGeom_destroy_r(m_hCtx, g);
         return bResult;
     }
@@ -60,7 +60,7 @@
     {
         bool bResult = false;
         GEOSGeometry* g = GeometryToGeos(geom);
-        bResult = GEOSPreparedDisjoint(m_pg, g);
+        bResult = GEOSPreparedDisjoint_r(m_hCtx, m_pg, g);
         GEOSGeom_destroy_r(m_hCtx, g);
         return bResult;
     }
@@ -68,7 +68,7 @@
     {
         bool bResult = false;
         GEOSGeometry* g = GeometryToGeos(geom);
-        bResult = GEOSPreparedIntersects(m_pg, g);
+        bResult = GEOSPreparedIntersects_r(m_hCtx, m_pg, g);
         GEOSGeom_destroy_r(m_hCtx, g);
         return bResult;
     }
@@ -76,7 +76,7 @@
     {
         bool bResult = false;
         GEOSGeometry* g = GeometryToGeos(geom);
-        bResult = GEOSPreparedOverlaps(m_pg, g);
+        bResult = GEOSPreparedOverlaps_r(m_hCtx, m_pg, g);
         GEOSGeom_destroy_r(m_hCtx, g);
         return bResult;
     }
@@ -84,7 +84,7 @@
     {
         bool bResult = false;
         GEOSGeometry* g = GeometryToGeos(geom);
-        bResult = GEOSPreparedTouches(m_pg, g);
+        bResult = GEOSPreparedTouches_r(m_hCtx, m_pg, g);
         GEOSGeom_destroy_r(m_hCtx, g);
         return bResult;
     }
@@ -92,7 +92,7 @@
     {
         bool bResult = false;
         GEOSGeometry* g = GeometryToGeos(geom);
-        bResult = GEOSPreparedWithin(m_pg, g);
+        bResult = GEOSPreparedWithin_r(m_hCtx, m_pg, g);
         GEOSGeom_destroy_r(m_hCtx, g);
         return bResult;
     }