[geos-commits] r3648 - trunk/capi

[svn_geos at osgeo.org]

Author: strk
Date: 2012-05-28 00:48:02 -0700 (Mon, 28 May 2012)
New Revision: 3648

Modified:
   trunk/capi/geos_c.cpp
   trunk/capi/geos_c.h.in
   trunk/capi/geos_ts_c.cpp
Log:
Rename interrupt request/cancel methods, cancel interrupt in init

Modified: trunk/capi/geos_c.cpp
===================================================================
--- trunk/capi/geos_c.cpp	2012-05-25 15:50:38 UTC (rev 3647)
+++ trunk/capi/geos_c.cpp	2012-05-28 07:48:02 UTC (rev 3648)
@@ -102,6 +102,8 @@
         GEOSContext_setNoticeHandler_r(handle, nf);
         GEOSContext_setErrorHandler_r(handle, ef);
     }
+
+    geos::util::Interrupt::cancel();
 }
 
 void
@@ -114,13 +116,13 @@
 }
 
 void
-GEOS_requestInterruption()
+GEOS_interruptRequest()
 {
   geos::util::Interrupt::request();
 }
 
 void
-GEOS_cancelInterruption()
+GEOS_interruptCancel()
 {
   geos::util::Interrupt::cancel();
 }

Modified: trunk/capi/geos_c.h.in
===================================================================
--- trunk/capi/geos_c.h.in	2012-05-25 15:50:38 UTC (rev 3647)
+++ trunk/capi/geos_c.h.in	2012-05-28 07:48:02 UTC (rev 3648)
@@ -155,9 +155,9 @@
 extern GEOSDeallocator GEOS_DLL GEOS_setDeallocator(GEOSDeallocator nf);
 
 /* Request safe interruption of operations */
-extern void GEOS_DLL GEOS_requestInterruption();
-/* Cancel a pending interruption */
-extern void GEOS_DLL GEOS_cancelInterruption();
+extern void GEOS_DLL GEOS_interruptRequest();
+/* Cancel a pending interruption request */
+extern void GEOS_DLL GEOS_interruptCancel();
 
 
 extern GEOSContextHandle_t GEOS_DLL initGEOS_r(

Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp	2012-05-25 15:50:38 UTC (rev 3647)
+++ trunk/capi/geos_ts_c.cpp	2012-05-28 07:48:02 UTC (rev 3648)
@@ -59,6 +59,7 @@
 #include <geos/operation/sharedpaths/SharedPathsOp.h>
 #include <geos/linearref/LengthIndexedLine.h>
 #include <geos/util/IllegalArgumentException.h>
+#include <geos/util/Interrupt.h>
 #include <geos/util/UniqueCoordinateArrayFilter.h>
 #include <geos/util/Machine.h>
 #include <geos/version.h> 
@@ -206,6 +207,8 @@
         handle->initialized = 1;
     }
 
+    geos::util::Interrupt::cancel();
+
     return static_cast<GEOSContextHandle_t>(extHandle);
 }