Ticket #208: memdiff.patch

capi/geos_c.cpp

@@ -107 +107 @@
 
 static GEOSMessageHandler NOTICE_MESSAGE;
 static GEOSMessageHandler ERROR_MESSAGE;
+static GEOSMemoryAllocator GEOS_MALLOC;
+static GEOSMemoryDeallocator GEOS_FREE;
 static int WKBOutputDims = 2;
 static int WKBByteOrder = getMachineByteOrder();
 
+#include <exception> // for std::bad_alloc
+#include <new>
+#include <cstdlib> // for malloc() and free()
+#include <cstdio> // for printf()
+
+// Visual C++ fix of operator new
+
+void* operator new (size_t size) throw (std::bad_alloc)
+{
+  void *p;
+  if(GEOS_MALLOC) {
+    p=GEOS_MALLOC(size);
+    printf("geos ");
+  } 
+  else {
+    p=malloc(size); 
+    printf("std ");
+  }
+  if (p==0) { // did malloc succeed?
+    throw std::bad_alloc(); // ANSI/ISO compliant behavior
+  }
+  printf("alloc!\n");
+  return p;
+}
+
+void operator delete (void *p) throw()
+{
+  if(GEOS_FREE) {
+    GEOS_FREE(p);
+  } 
+  else {
+    free(p); 
+  }
+}
+
+
+
 extern "C" {
 
 void
 initGEOS (GEOSMessageHandler nf, GEOSMessageHandler ef)
+
 {
         NOTICE_MESSAGE = nf;
         ERROR_MESSAGE = ef;
 }
 
 void
+initGEOSMemory(GEOSMemoryAllocator ma, GEOSMemoryDeallocator da)
+{
+        GEOS_FREE = da;
+        GEOS_MALLOC = ma;
+}
+
+void
 finishGEOS ()
 {
         // Nothing to do