[geos-commits] r2755 - in trunk: capi source/geomgraph source/headers/geos/geom source/precision

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-11-30 12:29:48 -0500 (Mon, 30 Nov 2009)
New Revision: 2755

Modified:
   trunk/capi/geos_ts_c.cpp
   trunk/source/geomgraph/EdgeEnd.cpp
   trunk/source/headers/geos/geom/CoordinateSequenceFilter.h
   trunk/source/precision/EnhancedPrecisionOp.cpp
Log:
* GEOSFree_r should check context handle even if its not used - nullptr may indicate logic error.

Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp	2009-11-30 13:55:12 UTC (rev 2754)
+++ trunk/capi/geos_ts_c.cpp	2009-11-30 17:29:48 UTC (rev 2755)
@@ -193,6 +193,8 @@
 void 
 GEOSFree_r (GEOSContextHandle_t extHandle, void* buffer) 
 { 
+    assert(0 != extHandle);
+
     std::free(buffer); 
 } 
 
@@ -3846,7 +3848,7 @@
         }
     }
     
-    return ret;
+    return static_cast<char>(ret);
 }
 
 void

Modified: trunk/source/geomgraph/EdgeEnd.cpp
===================================================================
--- trunk/source/geomgraph/EdgeEnd.cpp	2009-11-30 13:55:12 UTC (rev 2754)
+++ trunk/source/geomgraph/EdgeEnd.cpp	2009-11-30 17:29:48 UTC (rev 2755)
@@ -182,7 +182,7 @@
 
 /*public*/
 void
-EdgeEnd::computeLabel(const algorithm::BoundaryNodeRule& boundaryNodeRule)
+EdgeEnd::computeLabel(const algorithm::BoundaryNodeRule& /*boundaryNodeRule*/)
 {
 	// subclasses should override this if they are using labels
 }

Modified: trunk/source/headers/geos/geom/CoordinateSequenceFilter.h
===================================================================
--- trunk/source/headers/geos/geom/CoordinateSequenceFilter.h	2009-11-30 13:55:12 UTC (rev 2754)
+++ trunk/source/headers/geos/geom/CoordinateSequenceFilter.h	2009-11-30 17:29:48 UTC (rev 2755)
@@ -68,7 +68,7 @@
    *             is applied
    * @param i the index of the coordinate to apply the filter to
    */
-  virtual void filter_rw(CoordinateSequence& /*seq*/, size_t i)
+  virtual void filter_rw(CoordinateSequence& /*seq*/, size_t /*i*/)
   { assert(0); }
 
   /**
@@ -78,7 +78,7 @@
    *             is applied
    * @param i the index of the coordinate to apply the filter to
    */
-  virtual void filter_ro(const CoordinateSequence& /*seq*/, size_t i)
+  virtual void filter_ro(const CoordinateSequence& /*seq*/, size_t /*i*/)
   { assert(0); }
 
   /**

Modified: trunk/source/precision/EnhancedPrecisionOp.cpp
===================================================================
--- trunk/source/precision/EnhancedPrecisionOp.cpp	2009-11-30 13:55:12 UTC (rev 2754)
+++ trunk/source/precision/EnhancedPrecisionOp.cpp	2009-11-30 17:29:48 UTC (rev 2755)
@@ -82,6 +82,8 @@
 #if GEOS_DEBUG
 		std::cerr << "Reduced operation exception: "
 		          << ex2.what() << std::endl;
+#else
+        (void)ex2;
 #endif
 		throw originalEx;
 	}