Changeset 1586:e26071072b5e

Timestamp:

02/20/10 12:58:21 (5 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

use stack-based OGRSpatialReference instead of heap-based

Files:

• apps/oci_wrapper.cpp (modified) (1 diff)
• src/lasspatialreference.cpp (modified) (4 diffs)

apps/oci_wrapper.cpp

@@ -466 +466 @@
     if( nStmtType != OCI_STMT_SELECT )
     {
-        // nStmtMode = OCI_COMMIT_ON_SUCCESS;
-        nStmtMode = OCI_DEFAULT;
+        nStmtMode = OCI_COMMIT_ON_SUCCESS;
+        // nStmtMode = OCI_DEFAULT;
 
     }

src/lasspatialreference.cpp

@@ -402 +402 @@
             poSRS->exportToWkt( &pszWKT );
             
-            OGRSpatialReference::DestroySpatialReference(poSRS);
+            delete poSRS;
         }
 #endif
@@ -423 +423 @@
     char* poWKT = 0;
     const char* input = v.c_str();
-    OGRSpatialReference* poSRS = (OGRSpatialReference*) OSRNewSpatialReference(NULL);
-    if (OGRERR_NONE != poSRS->SetFromUserInput((char *) input))
-    {
-        OGRSpatialReference::DestroySpatialReference(poSRS);
+    
+    // OGRSpatialReference* poSRS = (OGRSpatialReference*) OSRNewSpatialReference(NULL);
+    OGRSpatialReference srs(NULL);
+    if (OGRERR_NONE != srs.SetFromUserInput((char *) input))
+    {
         throw std::invalid_argument("could not import coordinate system into OSRSpatialReference SetFromUserInput");
     }
     
-    poSRS->exportToWkt(&poWKT);
-    OGRSpatialReference::DestroySpatialReference(poSRS);
+    srs.exportToWkt(&poWKT);
     
     std::string tmp(poWKT);
@@ -518 +518 @@
     const char* poWKT = wkt.c_str();
     
-    OGRSpatialReference* poSRS = (OGRSpatialReference*) OSRNewSpatialReference(NULL);
-    if (OGRERR_NONE != poSRS->importFromWkt((char **) &poWKT))
-    {
-        OGRSpatialReference::DestroySpatialReference(poSRS);
+    OGRSpatialReference srs(NULL);
+    if (OGRERR_NONE != srs.importFromWkt((char **) &poWKT))
+    {
         return std::string();
     }
     
     char* proj4 = 0;
-    poSRS->exportToProj4(&proj4);
+    srs.exportToProj4(&proj4);
     std::string tmp(proj4);
     CPLFree(proj4);
     
-    OGRSpatialReference::DestroySpatialReference(poSRS);
-
     return tmp;
 #endif
@@ -567 +564 @@
     char* poWKT = 0;
     const char* poProj4 = v.c_str();
-    OGRSpatialReference* poSRS = (OGRSpatialReference*) OSRNewSpatialReference(NULL);
-    if (OGRERR_NONE != poSRS->importFromProj4((char *) poProj4))
-    {
-        OGRSpatialReference::DestroySpatialReference(poSRS);
+
+    OGRSpatialReference srs(NULL);
+    if (OGRERR_NONE != srs.importFromProj4((char *) poProj4))
+    {
         throw std::invalid_argument("could not import proj4 into OSRSpatialReference SetProj4");
     }
     
-    poSRS->exportToWkt(&poWKT);
-    OGRSpatialReference::DestroySpatialReference(poSRS);
+    srs.exportToWkt(&poWKT);
     
     std::string tmp(poWKT);