MonetDB: geos-reentrant - use modern api GEOS_init_r and GEOS_fi...

[Niels Nes via checkin-list]

Changeset: d8c9cbb1a5f4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d8c9cbb1a5f4
Modified Files:
        geom/lib/libgeom.c
Branch: geos-reentrant
Log Message:

use modern api GEOS_init_r and GEOS_finish_r


diffs (24 lines):

diff --git a/geom/lib/libgeom.c b/geom/lib/libgeom.c
--- a/geom/lib/libgeom.c
+++ b/geom/lib/libgeom.c
@@ -37,7 +37,10 @@ geomerror(_In_z_ _Printf_format_string_ 
 void
 libgeom_init(void)
 {
-       geoshandle = initGEOS_r((GEOSMessageHandler) geomerror, 
(GEOSMessageHandler) geomerror);
+       //geoshandle = initGEOS_r((GEOSMessageHandler) geomerror, 
(GEOSMessageHandler) geomerror);
+       geoshandle = GEOS_init_r ();
+    GEOSContext_setNoticeHandler_r(geoshandle, (GEOSMessageHandler) geomerror);
+    GEOSContext_setErrorHandler_r(geoshandle, (GEOSMessageHandler) geomerror);
     // TODO: deprecated call REMOVE
        GEOS_setWKBByteOrder(1);        /* NDR (little endian) */
        printf("# MonetDB/GIS module loaded\n");
@@ -47,7 +50,7 @@ libgeom_init(void)
 void
 libgeom_exit(void)
 {
-       finishGEOS_r(geoshandle);
+       GEOS_finish_r(geoshandle);
 }
 
 bool
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org