[geos-commits] r4185 - trunk/capi

Sandro Santilli strk at keybit.net
Tue Apr 19 09:26:55 PDT 2016 

Author: strk
Date: 2016-04-19 09:26:54 -0700 (Tue, 19 Apr 2016)
New Revision: 4185

Modified:
   trunk/capi/geos_ts_c.cpp
Log:
Trim trailing whitespaces (as per .editorconfig)

Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp	2016-04-19 16:04:38 UTC (rev 4184)
+++ trunk/capi/geos_ts_c.cpp	2016-04-19 16:26:54 UTC (rev 4185)
@@ -8,7 +8,7 @@
  *
  * This is free software; you can redistribute and/or modify it under
  * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation. 
+ * by the Free Software Foundation.
  * See the COPYING file for more information.
  *
  * Author: Sandro Santilli <strk at keybit.net>
@@ -17,23 +17,23 @@
  ***********************************************************************/
 
 #include <geos/platform.h>  // for FINITE
-#include <geos/geom/Geometry.h> 
-#include <geos/geom/prep/PreparedGeometry.h> 
-#include <geos/geom/prep/PreparedGeometryFactory.h> 
-#include <geos/geom/GeometryCollection.h> 
-#include <geos/geom/Polygon.h> 
-#include <geos/geom/Point.h> 
-#include <geos/geom/MultiPoint.h> 
-#include <geos/geom/MultiLineString.h> 
-#include <geos/geom/MultiPolygon.h> 
-#include <geos/geom/LinearRing.h> 
-#include <geos/geom/LineString.h> 
-#include <geos/geom/PrecisionModel.h> 
-#include <geos/geom/GeometryFactory.h> 
-#include <geos/geom/CoordinateSequenceFactory.h> 
-#include <geos/geom/Coordinate.h> 
-#include <geos/geom/IntersectionMatrix.h> 
-#include <geos/geom/Envelope.h> 
+#include <geos/geom/Geometry.h>
+#include <geos/geom/prep/PreparedGeometry.h>
+#include <geos/geom/prep/PreparedGeometryFactory.h>
+#include <geos/geom/GeometryCollection.h>
+#include <geos/geom/Polygon.h>
+#include <geos/geom/Point.h>
+#include <geos/geom/MultiPoint.h>
+#include <geos/geom/MultiLineString.h>
+#include <geos/geom/MultiPolygon.h>
+#include <geos/geom/LinearRing.h>
+#include <geos/geom/LineString.h>
+#include <geos/geom/PrecisionModel.h>
+#include <geos/geom/GeometryFactory.h>
+#include <geos/geom/CoordinateSequenceFactory.h>
+#include <geos/geom/Coordinate.h>
+#include <geos/geom/IntersectionMatrix.h>
+#include <geos/geom/Envelope.h>
 #include <geos/index/strtree/STRtree.h>
 #include <geos/index/strtree/GeometryItemDistance.h>
 #include <geos/index/ItemVisitor.h>
@@ -71,7 +71,7 @@
 #include <geos/util/Interrupt.h>
 #include <geos/util/UniqueCoordinateArrayFilter.h>
 #include <geos/util/Machine.h>
-#include <geos/version.h> 
+#include <geos/version.h>
 
 // This should go away
 #include <cmath> // finite
@@ -90,7 +90,7 @@
 #pragma warning(disable : 4099)
 #endif
 
-// Some extra magic to make type declarations in geos_c.h work - 
+// Some extra magic to make type declarations in geos_c.h work -
 // for cross-checking of types in header.
 #define GEOSGeometry geos::geom::Geometry
 #define GEOSPreparedGeometry geos::geom::prep::PreparedGeometry
@@ -291,7 +291,7 @@
     }
 
     assert(0 != out);
-    
+
     // we haven't been checking allocation before ticket #371
     if (0 == out)
     {
@@ -398,13 +398,13 @@
     finishGEOS_r(extHandle);
 }
 
-void 
-GEOSFree_r (GEOSContextHandle_t extHandle, void* buffer) 
-{ 
+void
+GEOSFree_r (GEOSContextHandle_t extHandle, void* buffer)
+{
     assert(0 != extHandle);
 
-    free(buffer); 
-} 
+    free(buffer);
+}
 
 //-----------------------------------------------------------
 // relate()-related functions
@@ -475,7 +475,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -507,7 +507,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -539,7 +539,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -571,7 +571,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -607,7 +607,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -639,7 +639,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -671,7 +671,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -703,7 +703,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -741,7 +741,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -780,7 +780,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -808,7 +808,7 @@
         {
             return 0;
         }
-       
+
         char *result = gstrdup(im->toString());
 
         delete im;
@@ -824,7 +824,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -874,7 +874,7 @@
         }
 
         if (0 == im) return 0;
-       
+
         char *result = gstrdup(im->toString());
 
         delete im;
@@ -890,7 +890,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -941,7 +941,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -1118,7 +1118,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -1152,7 +1152,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -1186,7 +1186,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -1220,7 +1220,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -1254,7 +1254,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -1288,7 +1288,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -1320,7 +1320,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1356,7 +1356,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1437,7 +1437,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-   
+
     return NULL;
 }
 
@@ -1475,7 +1475,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1521,7 +1521,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1560,7 +1560,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1591,7 +1591,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -1697,7 +1697,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1729,7 +1729,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return -1;
 }
 
@@ -1765,7 +1765,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1796,7 +1796,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1828,7 +1828,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1884,7 +1884,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1930,7 +1930,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -1973,7 +1973,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -2005,7 +2005,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -2106,7 +2106,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -2138,7 +2138,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -2196,7 +2196,7 @@
     catch (const std::exception &e)
     {
 #if VERBOSE_EXCEPTIONS
-        std::ostringstream s; 
+        std::ostringstream s;
         s << "Exception on GEOSUnion with following inputs:" << std::endl;
         s << "A: "<<g1->toString() << std::endl;
         s << "B: "<<g2->toString() << std::endl;
@@ -2208,7 +2208,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -2235,7 +2235,7 @@
     catch (const std::exception &e)
     {
 #if VERBOSE_EXCEPTIONS
-        std::ostringstream s; 
+        std::ostringstream s;
         s << "Exception on GEOSUnaryUnion with following inputs:" << std::endl;
         s << "A: "<<g1->toString() << std::endl;
         s << "B: "<<g2->toString() << std::endl;
@@ -2247,7 +2247,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -2274,7 +2274,7 @@
     catch (const std::exception &e)
     {
 #if VERBOSE_EXCEPTIONS
-        std::ostringstream s; 
+        std::ostringstream s;
         s << "Exception on GEOSUnaryUnion with following inputs:" << std::endl;
         s << "A: "<<g1->toString() << std::endl;
         s << "B: "<<g2->toString() << std::endl;
@@ -2286,7 +2286,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -2308,7 +2308,7 @@
     try
     {
         const geos::geom::MultiPolygon *p = dynamic_cast<const geos::geom::MultiPolygon *>(g1);
-        if ( ! p ) 
+        if ( ! p )
         {
             handle->ERROR_MESSAGE("Invalid argument (must be a MultiPolygon)");
             return NULL;
@@ -2325,7 +2325,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -2350,7 +2350,7 @@
         if ( ! ret )
         {
             const GeometryFactory* gf = handle->geomFactory;
-            // return an empty point 
+            // return an empty point
             return gf->createPoint();
         }
         return ret;
@@ -2363,7 +2363,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -2393,7 +2393,7 @@
     catch (const std::exception &e)
     {
 #if VERBOSE_EXCEPTIONS
-        std::ostringstream s; 
+        std::ostringstream s;
         s << "Exception on GEOSClipByRect with following inputs:" << std::endl;
         s << "A: "<<g1->toString() << std::endl;
         s << "B: "<<g2->toString() << std::endl;
@@ -2405,7 +2405,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -2418,7 +2418,7 @@
 {
     GEOSContextHandleInternal_t *handle = 0;
 
-    // FIXME: mloskot: Does this try-catch around delete means that 
+    // FIXME: mloskot: Does this try-catch around delete means that
     // destructors in GEOS may throw? If it does, this is a serious
     // violation of "never throw an exception from a destructor" principle
 
@@ -2508,12 +2508,12 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return -1;
 }
 
 /*
- * Return -1 on exception, 0 otherwise. 
+ * Return -1 on exception, 0 otherwise.
  * Converts Geometry to normal form (or canonical form).
  */
 int
@@ -2546,7 +2546,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return -1;
 }
 
@@ -2583,7 +2583,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return -1;
 }
 
@@ -2616,7 +2616,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return -1;
 }
 
@@ -2652,7 +2652,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -3021,7 +3021,7 @@
     try
     {
         const Polygon *p = dynamic_cast<const Polygon *>(g1);
-        if ( ! p ) 
+        if ( ! p )
         {
             handle->ERROR_MESSAGE("Invalid argument (must be a Polygon)");
             return NULL;
@@ -3036,7 +3036,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -3062,7 +3062,7 @@
     try
     {
         const Polygon *p = dynamic_cast<const Polygon *>(g1);
-        if ( ! p ) 
+        if ( ! p )
         {
             handle->ERROR_MESSAGE("Invalid argument (must be a Polygon)");
             return NULL;
@@ -3077,7 +3077,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -3114,7 +3114,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -3136,7 +3136,7 @@
 #ifdef GEOS_DEBUG
     char buf[256];
     sprintf(buf, "createCollection: requested type %d", type);
-    handle->NOTICE_MESSAGE("%s", buf);// TODO: Can handle->NOTICE_MESSAGE format that directly? 
+    handle->NOTICE_MESSAGE("%s", buf);// TODO: Can handle->NOTICE_MESSAGE format that directly?
 #endif
 
     try
@@ -3161,9 +3161,9 @@
             default:
                 handle->ERROR_MESSAGE("Unsupported type request for GEOSGeom_createEmptyCollection_r");
                 g = 0;
-                
+
         }
-        
+
         return g;
     }
     catch (const std::exception &e)
@@ -3197,7 +3197,7 @@
     char buf[256];
     sprintf(buf, "PostGIS2GEOS_collection: requested type %d, ngeoms: %d",
             type, ngeoms);
-    handle->NOTICE_MESSAGE("%s", buf);// TODO: Can handle->NOTICE_MESSAGE format that directly? 
+    handle->NOTICE_MESSAGE("%s", buf);// TODO: Can handle->NOTICE_MESSAGE format that directly?
 #endif
 
     try
@@ -3224,9 +3224,9 @@
                 handle->ERROR_MESSAGE("Unsupported type request for PostGIS2GEOS_collection");
                 delete vgeoms;
                 g = 0;
-                
+
         }
-        
+
         return g;
     }
     catch (const std::exception &e)
@@ -3289,7 +3289,7 @@
         // or add a wrapper which semantic is similar to:
         // std::vector<as_polygon<Geometry*> >
         std::vector<Geometry*> *polyvec = new std::vector<Geometry *>(polys->size());
-        
+
         for (std::size_t i = 0; i < polys->size(); ++i)
         {
             (*polyvec)[i] = (*polys)[i];
@@ -3563,7 +3563,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -3579,7 +3579,7 @@
     return GEOS_JTS_PORT;
 }
 
-char 
+char
 GEOSHasZ_r(GEOSContextHandle_t extHandle, const Geometry *g)
 {
     assert(0 != g);
@@ -3720,7 +3720,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -3754,7 +3754,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -3805,7 +3805,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -3843,7 +3843,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -3897,7 +3897,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -3935,7 +3935,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -4006,7 +4006,7 @@
         }
 
         const Point *p = dynamic_cast<const Point *>(g);
-        if ( p ) 
+        if ( p )
         {
             return p->getCoordinatesRO();
         }
@@ -4022,7 +4022,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -4054,7 +4054,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4074,7 +4074,7 @@
     }
 
     try
-    { 
+    {
         const GeometryFactory *gf = handle->geomFactory;
         return gf->createPoint(cs);
     }
@@ -4106,7 +4106,7 @@
     }
 
     try
-    { 
+    {
         const GeometryFactory *gf = handle->geomFactory;
 
         return gf->createLinearRing(cs);
@@ -4119,7 +4119,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4139,7 +4139,7 @@
     }
 
     try
-    { 
+    {
         const GeometryFactory *gf = handle->geomFactory;
 
         return gf->createLineString();
@@ -4152,7 +4152,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4172,7 +4172,7 @@
     }
 
     try
-    { 
+    {
         const GeometryFactory *gf = handle->geomFactory;
 
         return gf->createLineString(cs);
@@ -4185,7 +4185,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4217,7 +4217,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4242,7 +4242,7 @@
     try
     {
         using geos::geom::LinearRing;
-        
+
         std::vector<Geometry *> *vholes = new std::vector<Geometry *>(holes, holes + nholes);
 
         LinearRing *nshell = dynamic_cast<LinearRing *>(shell);
@@ -4264,7 +4264,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4297,7 +4297,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4422,7 +4422,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -4453,7 +4453,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -4486,7 +4486,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4519,7 +4519,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4553,7 +4553,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4630,7 +4630,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -4663,7 +4663,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -4741,7 +4741,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4900,7 +4900,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -4993,7 +4993,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -5002,7 +5002,7 @@
 {
     assert(0 != reader);
     assert(0 != hex);
-    
+
     if ( 0 == extHandle )
     {
         return 0;
@@ -5017,7 +5017,7 @@
 
     try
     {
-        std::string hexstring(reinterpret_cast<const char*>(hex), size); 
+        std::string hexstring(reinterpret_cast<const char*>(hex), size);
         std::istringstream is(std::ios_base::binary);
         is.str(hexstring);
         is.seekg(0, std::ios::beg); // rewind reader pointer
@@ -5033,7 +5033,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 0;
 }
 
@@ -5066,7 +5066,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -5206,7 +5206,7 @@
 GEOSWKBWriter_getOutputDimension_r(GEOSContextHandle_t extHandle, const GEOSWKBWriter* writer)
 {
     assert(0 != writer);
-    
+
     if ( 0 == extHandle )
     {
         return 0;
@@ -5345,7 +5345,7 @@
             handle->ERROR_MESSAGE("Unknown exception thrown");
         }
     }
-    
+
     return static_cast<char>(ret);
 }
 
@@ -5376,7 +5376,7 @@
 
 
 //-----------------------------------------------------------------
-// Prepared Geometry 
+// Prepared Geometry
 //-----------------------------------------------------------------
 
 const geos::geom::prep::PreparedGeometry*
@@ -5408,7 +5408,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return prep;
 }
 
@@ -5472,7 +5472,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = pg->contains(g);
         return result;
@@ -5485,7 +5485,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -5508,7 +5508,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = pg->containsProperly(g);
         return result;
@@ -5521,7 +5521,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -5544,7 +5544,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = pg->coveredBy(g);
         return result;
@@ -5557,7 +5557,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -5580,7 +5580,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = pg->covers(g);
         return result;
@@ -5593,7 +5593,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -5616,7 +5616,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = pg->crosses(g);
         return result;
@@ -5629,7 +5629,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -5652,7 +5652,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = pg->disjoint(g);
         return result;
@@ -5665,7 +5665,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -5688,7 +5688,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = pg->intersects(g);
         return result;
@@ -5701,7 +5701,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -5724,7 +5724,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = pg->overlaps(g);
         return result;
@@ -5737,7 +5737,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -5760,7 +5760,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = pg->touches(g);
         return result;
@@ -5773,7 +5773,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -5796,7 +5796,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = pg->within(g);
         return result;
@@ -5809,7 +5809,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -5847,7 +5847,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return tree;
 }
 
@@ -5897,7 +5897,7 @@
     }
 }
 
-void 
+void
 GEOSSTRtree_query_r(GEOSContextHandle_t extHandle,
                     geos::index::strtree::STRtree *tree,
                     const geos::geom::Geometry *g,
@@ -6020,7 +6020,7 @@
     return NULL;
 }
 
-void 
+void
 GEOSSTRtree_iterate_r(GEOSContextHandle_t extHandle,
                     geos::index::strtree::STRtree *tree,
                     GEOSQueryCallback callback,
@@ -6088,7 +6088,7 @@
         return 2;
     }
 
-    try 
+    try
     {
         bool result = tree->remove(g->getEnvelopeInternal(), item);
         return result;
@@ -6101,7 +6101,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return 2;
 }
 
@@ -6153,7 +6153,7 @@
               const Geometry *p)
 {
     if ( 0 == extHandle ) return -1.0;
-    GEOSContextHandleInternal_t *handle = 
+    GEOSContextHandleInternal_t *handle =
         reinterpret_cast<GEOSContextHandleInternal_t*>(extHandle);
     if ( handle->initialized == 0 ) return -1.0;
 
@@ -6181,7 +6181,7 @@
 GEOSInterpolate_r(GEOSContextHandle_t extHandle, const Geometry *g, double d)
 {
     if ( 0 == extHandle ) return 0;
-    GEOSContextHandleInternal_t *handle = 
+    GEOSContextHandleInternal_t *handle =
         reinterpret_cast<GEOSContextHandleInternal_t*>(extHandle);
     if ( handle->initialized == 0 ) return 0;
 
@@ -6320,7 +6320,7 @@
     SharedPathsOp::PathList forw, back;
     try {
       SharedPathsOp::sharedPathsOp(*g1, *g2, forw, back);
-    } 
+    }
     catch (const std::exception &e)
     {
         SharedPathsOp::clearEdges(forw);
@@ -6439,7 +6439,7 @@
 GEOSBufferParams_destroy_r(GEOSContextHandle_t extHandle, BufferParameters* p)
 {
   (void)extHandle;
-  delete p;     
+  delete p;
 }
 
 int
@@ -6609,7 +6609,7 @@
     {
         handle->ERROR_MESSAGE("Unknown exception thrown");
     }
-    
+
     return NULL;
 }
 
@@ -6645,30 +6645,30 @@
 
     return NULL;
 }
-Geometry* 
+Geometry*
 GEOSVoronoiDiagram_r(GEOSContextHandle_t extHandle, const Geometry *g1, const Geometry *env, double tolerance ,int onlyEdges)
 {
 	if ( 0 == extHandle ) return NULL;
 
-	GEOSContextHandleInternal_t *handle = 0; 
+	GEOSContextHandleInternal_t *handle = 0;
 	handle = reinterpret_cast<GEOSContextHandleInternal_t*>(extHandle);
 	if ( 0 == handle->initialized ) return NULL;
 
 	using geos::triangulate::VoronoiDiagramBuilder;
 
-	try  
-	{    
+	try
+	{
 		VoronoiDiagramBuilder builder;
 		builder.setSites(*g1);
 		builder.setTolerance(tolerance);
     if(env) builder.setClipEnvelope(env->getEnvelopeInternal());
 		if(onlyEdges) return builder.getDiagramEdges(*g1->getFactory()).release();
 		else return builder.getDiagram(*g1->getFactory()).release();
-	}    
+	}
 	catch(const std::exception &e)
-	{    
+	{
 		handle->ERROR_MESSAGE("%s", e.what());
-	}    
+	}
 	catch(...)
 	{
 		handle->ERROR_MESSAGE("Unknow exception thrown");

More information about the geos-commits mailing list