[QGIS Commit] r8171 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-02-20 12:20:47 -0500 (Wed, 20 Feb 2008)
New Revision: 8171

Modified:
   trunk/qgis/src/core/qgsgeometry.cpp
Log:
Modified geos exception catching. It seems that geos2 throws exceptions as pointers and geos3 as objects

Modified: trunk/qgis/src/core/qgsgeometry.cpp
===================================================================
--- trunk/qgis/src/core/qgsgeometry.cpp	2008-02-20 02:54:40 UTC (rev 8170)
+++ trunk/qgis/src/core/qgsgeometry.cpp	2008-02-20 17:20:47 UTC (rev 8171)
@@ -34,6 +34,7 @@
 #define GEOS_UTIL geos
 #define GEOS_SIZE_T int
 #define COORD_SEQ_FACTORY DefaultCoordinateSequenceFactory
+#define GEOS_EXCEPTION GEOS_UTIL::GEOSException* 
 #else
 #include <geos/geom/CoordinateArraySequence.h>
 #include <geos/geom/CoordinateArraySequenceFactory.h>
@@ -54,6 +55,7 @@
 #define GEOS_UTIL geos::util
 #define GEOS_SIZE_T size_t
 #define COORD_SEQ_FACTORY CoordinateArraySequenceFactory
+#define GEOS_EXCEPTION GEOS_UTIL::GEOSException&
 #endif
 
 // Set up static GEOS geometry factory
@@ -144,9 +146,12 @@
     {
       geom = geosGeometryFactory->createPoint(coord);
     }
-  catch(GEOS_UTIL::GEOSException* e)
+  catch(GEOS_EXCEPTION e)
     {
-      delete e; return 0;
+#if GEOS_VERSION_MAJOR < 3
+      delete e;
+#endif
+      return 0;
     }
   QgsGeometry* g = new QgsGeometry;
   g->setGeos(geom);
@@ -166,9 +171,12 @@
 	{ 
 	  (*pointVector)[i] = geosGeometryFactory->createPoint(currentCoord);
 	}
-      catch(GEOS_UTIL::GEOSException* e)
+      catch(GEOS_EXCEPTION e)
 	{
-	  delete e; delete pointVector; return 0;
+#if GEOS_VERSION_MAJOR < 3
+	  delete e;
+#endif 
+	  delete pointVector; return 0;
 	}
     }
 
@@ -177,9 +185,12 @@
     {
       geom = geosGeometryFactory->createMultiPoint(pointVector);
     }
-  catch(GEOS_UTIL::GEOSException* e)
+  catch(GEOS_EXCEPTION e)
     {
-      delete e; return 0;
+#if GEOS_VERSION_MAJOR < 3
+      delete e;
+#endif
+      return 0;
     }
 
   QgsGeometry* g = new QgsGeometry;
@@ -205,9 +216,12 @@
     {
       geom = geosGeometryFactory->createLineString(seq);
     }
-  catch(GEOS_UTIL::GEOSException* e)
+  catch(GEOS_EXCEPTION e)
     {
-      delete e; delete seq;
+#if GEOS_VERSION_MAJOR < 3
+      delete e;
+#endif
+      delete seq;
       return 0;
     }
   QgsGeometry* g = new QgsGeometry;
@@ -233,9 +247,12 @@
 	{
 	  currentLineString = geosGeometryFactory->createLineString(seq);
 	}
-      catch(GEOS_UTIL::GEOSException* e)
+      catch(GEOS_EXCEPTION e)
 	{
-	  delete lineVector; delete seq; delete e;
+#if GEOS_VERSION_MAJOR < 3
+	  delete e;
+#endif
+	  delete lineVector; delete seq;
 	  return 0;
 	}
       (*lineVector)[i] = currentLineString;
@@ -246,9 +263,12 @@
     {
       geom = geosGeometryFactory->createMultiLineString(lineVector);
     }
-  catch(GEOS_UTIL::GEOSException* e)
+  catch(GEOS_EXCEPTION e)
     {
-      delete e; return 0;
+#if GEOS_VERSION_MAJOR < 3
+      delete e;
+#endif
+      return 0;
     }
   QgsGeometry* g = new QgsGeometry;
   g->setGeos(geom);
@@ -280,9 +300,12 @@
     {
       linRing = geosGeometryFactory->createLinearRing(seq);
     }
-  catch(GEOS_UTIL::GEOSException* e)
+  catch(GEOS_EXCEPTION e)
     {
-      delete e; return 0;
+#if GEOS_VERSION_MAJOR < 3
+      delete e;
+#endif
+      return 0;
     }
   
   return linRing;
@@ -311,9 +334,12 @@
     {
       geom = geosGeometryFactory->createPolygon(outerRing, holes);
     }
-  catch(GEOS_UTIL::GEOSException* e)
+  catch(GEOS_EXCEPTION e)
     {
-      delete e; return 0;
+#if GEOS_VERSION_MAJOR < 3
+      delete e;
+#endif
+      return 0;
     }
   QgsGeometry* g = new QgsGeometry;
   g->setGeos(geom);
@@ -344,9 +370,12 @@
 	{
 	  currentPolygon = geosGeometryFactory->createPolygon(currentOuterRing, currentHoles);
 	}
-      catch(GEOS_UTIL::GEOSException* e)
+      catch(GEOS_EXCEPTION e)
 	{
-	  delete e; delete polygons; return 0;
+#if GEOS_VERSION_MAJOR < 3
+	  delete e;
+#endif
+	  delete polygons; return 0;
 	}
       (*polygons)[i] = currentPolygon;
     }
@@ -356,9 +385,12 @@
     {
       geom = geosGeometryFactory->createMultiPolygon(polygons);
     }
-  catch(GEOS_UTIL::GEOSException* e)
+  catch(GEOS_EXCEPTION e)
     {
-      delete e; return 0;
+#if GEOS_VERSION_MAJOR < 3
+      delete e;
+#endif
+      return 0;
     }
   QgsGeometry* g = new QgsGeometry;
   g->setGeos(geom);
@@ -2553,10 +2585,12 @@
     {
       newRing = geosGeometryFactory->createLinearRing(newSequence);
     }
-  catch(GEOS_UTIL::IllegalArgumentException* e)
+  catch(GEOS_EXCEPTION e)
     {
+#if GEOS_VERSION_MAJOR < 3
+      delete e;
+#endif
       delete newSequence;
-      delete e;
       return 3;
     }
   std::vector<GEOS_GEOM::Geometry*> dummyVector;
@@ -2743,9 +2777,11 @@
     {
       newRing = geosGeometryFactory->createLinearRing(newSequence);
     }
-  catch(GEOS_UTIL::IllegalArgumentException* e)
+  catch(GEOS_EXCEPTION e)
     {
+#if GEOS_VERSION_MAJOR < 3
       delete e;
+#endif
       delete newSequence;
       return 2;
     }
@@ -2982,9 +3018,12 @@
 	  return 1;
 	}
     }
-  catch(GEOS_UTIL::GEOSException* e)
+  catch(GEOS_EXCEPTION e)
     {
-      delete e; return 2;
+#if GEOS_VERSION_MAJOR < 3
+      delete e;
+#endif
+      return 2;
     }
   return returnCode;
 }
@@ -3035,9 +3074,11 @@
 	  return 0; //nothing to do
 	}
     }
-  catch(GEOS_UTIL::GEOSException* e)
+  catch(GEOS_EXCEPTION e)
     {
+#if GEOS_VERSION_MAJOR < 3
       delete e;
+#endif
       return 5;
     }
   
@@ -3355,10 +3396,11 @@
 
      return mGeos->intersects(geometry->mGeos);
   }
-  catch (GEOS_UTIL::GEOSException &e)
+  catch (GEOS_EXCEPTION e)
   {
 #if GEOS_VERSION_MAJOR < 3
-    QString error = e.toString().c_str();
+    QString error = e->toString().c_str();
+    delete e;
 #else
     QString error = e.what();
 #endif
@@ -3927,9 +3969,11 @@
 	return FALSE;
       }
   }
-  catch(GEOS_UTIL::GEOSException* e)
+  catch(GEOS_EXCEPTION e)
     {
+#if GEOS_VERSION_MAJOR < 3
       delete e;
+#endif
       return FALSE;
     }
   return TRUE;
@@ -5115,7 +5159,19 @@
     {
       return 0;
     }
-  GEOS_GEOM::Geometry* geos = mGeos->Union(geometry->mGeos);
+  GEOS_GEOM::Geometry* geos = 0;
+  try
+    {
+      geos = mGeos->Union(geometry->mGeos);
+    }
+  catch(GEOS_EXCEPTION e)
+    {
+#if GEOS_VERSION_MAJOR < 3
+      delete e;
+#endif
+      //return this geometry if union not possible
+      return new QgsGeometry(*this);
+    }
   QgsGeometry* g = new QgsGeometry;
   g->setGeos(geos);
   return g;