[cig-commits] r6457 - in cs/spatialdata-0.1/trunk/modulesrc: geocoords spatialdb utils

[brad at geodynamics.org]

Author: brad
Date: 2007-03-28 21:10:58 -0700 (Wed, 28 Mar 2007)
New Revision: 6457

Modified:
   cs/spatialdata-0.1/trunk/modulesrc/geocoords/geocoords.pyxe.src
   cs/spatialdata-0.1/trunk/modulesrc/spatialdb/spatialdb.pyxe.src
   cs/spatialdata-0.1/trunk/modulesrc/utils/utils.pyxe.src
Log:
Updated to use CIG pyrexembed (need C wrappers for destructors).

Modified: cs/spatialdata-0.1/trunk/modulesrc/geocoords/geocoords.pyxe.src
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/geocoords/geocoords.pyxe.src	2007-03-29 01:09:09 UTC (rev 6456)
+++ cs/spatialdata-0.1/trunk/modulesrc/geocoords/geocoords.pyxe.src	2007-03-29 04:10:58 UTC (rev 6457)
@@ -33,10 +33,37 @@
   return PyCObject_AsVoidPtr(obj.handle)
 
 cdef extern from "stdlib.h":
-    ctypedef unsigned long size_t
-    void* malloc(size_t size)
-    void free(void* mem)
+  ctypedef unsigned long size_t
+  void* malloc(size_t size)
+  void free(void* mem)
 
+cdef void CoordSys_destructor(void* obj):
+  """
+  Destroy CoordSys object.
+  """
+  # create shim for destructor
+  #embed{ void CoordSys_destructor_cpp(void* pObj)
+  spatialdata::geocoords::CoordSys* pCS =
+  (spatialdata::geocoords::CoordSys*) pObj;
+  delete pCS;
+  #}embed
+  CoordSys_destructor_cpp(obj)
+  return
+
+cdef void Projector_destructor(void* obj):
+  """
+  Destroy Projector object.
+  """
+  # create shim for destructor
+  #embed{ void Projector_destructor_cpp(void* pObj)
+  spatialdata::geocoords::Projector* pProj =
+    (spatialdata::geocoords::Projector*) pObj;
+  delete pProj;
+  #}embed
+  Projector_destructor_cpp(obj)
+  return
+
+  
 # ----------------------------------------------------------------------
 cdef class CoordSys:
 
@@ -73,12 +100,6 @@
 
   def _createHandle(self):
     """Wrap pointer to C++ object in PyCObject."""
-    # create shim for destructor
-    #embed{ void CoordSys_destructor(void* pObj)
-    spatialdata::geocoords::CoordSys* pCS =
-      (spatialdata::geocoords::CoordSys*) pObj;
-    delete pCS;
-    #}embed
     return PyCObject_FromVoidPtr(self.thisptr, CoordSys_destructor)
 
 
@@ -667,12 +688,6 @@
 
   def _createHandle(self):
     """Wrap pointer to C++ object in PyCObject."""
-    # create shim for destructor
-    #embed{ void Projector_destructor(void* pObj)
-    spatialdata::geocoords::Projector* pProj =
-      (spatialdata::geocoords::Projector*) pObj;
-    delete pProj;
-    #}embed
     return PyCObject_FromVoidPtr(self.thisptr, Projector_destructor)
 
 

Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/spatialdb.pyxe.src
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/spatialdb.pyxe.src	2007-03-29 01:09:09 UTC (rev 6456)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/spatialdb.pyxe.src	2007-03-29 04:10:58 UTC (rev 6457)
@@ -42,7 +42,33 @@
   """
   return PyCObject_AsVoidPtr(obj.handle)
 
+cdef void SpatialDB_destructor(void* obj):
+  """
+  Destroy SpatialDB object.
+  """
+  # create shim for destructor
+  #embed{ void SpatialDB_destructor_cpp(void* pObj)
+  spatialdata::spatialdb::SpatialDB* pDB =
+    (spatialdata::spatialdb::SpatialDB*) pObj;
+  delete pDB;
+  #}embed
+  SpatialDB_destructor_cpp(obj)
+  return
 
+cdef void SimpleIO_destructor(void* obj):
+  """
+  Destructor SimplIO object.
+  """
+  # create shim for destructor
+  #embed{ void SimpleIO_destructor_cpp(void* pObj)
+  spatialdata::spatialdb::SimpleIO* pIO =
+    (spatialdata::spatialdb::SimpleIO*) pObj;
+  delete pIO;
+  #}embed
+  SimpleIO_destructor_cpp(obj)
+  return
+
+
 # ----------------------------------------------------------------------
 cdef class SpatialDB:
 
@@ -255,12 +281,6 @@
     """
     Wrap pointer to C++ object in PyCObject.
     """
-    # create shim for destructor
-    #embed{ void SpatialDB_destructor(void* pObj)
-    spatialdata::spatialdb::SpatialDB* pDB =
-      (spatialdata::spatialdb::SpatialDB*) pObj;
-    delete pDB;
-    #}embed
     return PyCObject_FromVoidPtr(self.thisptr, SpatialDB_destructor)
 
 
@@ -359,12 +379,6 @@
     """
     Wrap pointer to C++ object in PyCObject.
     """
-    # create shim for destructor
-    #embed{ void SimpleIO_destructor(void* pObj)
-    spatialdata::spatialdb::SimpleIO* pIO =
-      (spatialdata::spatialdb::SimpleIO*) pObj;
-    delete pIO;
-    #}embed
     return PyCObject_FromVoidPtr(self.thisptr, SimpleIO_destructor)
 
 

Modified: cs/spatialdata-0.1/trunk/modulesrc/utils/utils.pyxe.src
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/utils/utils.pyxe.src	2007-03-29 01:09:09 UTC (rev 6456)
+++ cs/spatialdata-0.1/trunk/modulesrc/utils/utils.pyxe.src	2007-03-29 04:10:58 UTC (rev 6457)
@@ -28,6 +28,19 @@
 cdef extern from "stdlib.h":
     ctypedef unsigned long size_t
 
+cdef void PointStream_destructor(void* obj):
+  """
+  Destroy PointsStream object.
+  """
+  #embed{ void PointsStream_destructor_cpp(void* pObj)
+  spatialdata::utils::PointsStream* pStream =
+  (spatialdata::utils::PointsStream*) pObj;
+  delete pStream;
+  #}embed
+  PointsStream_destructor_cpp(obj)
+  return
+  
+
 # ----------------------------------------------------------------------
 cdef class PointsStream:
   """
@@ -277,12 +290,7 @@
   def _createHandle(self):
     """Wrap pointer to C++ object in PyCObject."""
     # create shim for destructor
-    #embed{ void PointsStream_destructor(void* pObj)
-    spatialdata::utils::PointsStream* pStream =
-      (spatialdata::utils::PointsStream*) pObj;
-    delete pStream;
-    #}embed
-    return PyCObject_FromVoidPtr(self.thisptr, PointsStream_destructor)
+    return PyCObject_FromVoidPtr(self.thisptr, PointStream_destructor)
 
 
 # End of file