[geos-commits] r3929 - trunk/include/geos/geom

[svn_geos at osgeo.org]

Author: mloskot
Date: 2013-08-28 05:32:13 -0700 (Wed, 28 Aug 2013)
New Revision: 3929

Modified:
   trunk/include/geos/geom/BinaryOp.h
Log:
Add explicit cast from double to long unsigned int

Modified: trunk/include/geos/geom/BinaryOp.h
===================================================================
--- trunk/include/geos/geom/BinaryOp.h	2013-08-28 12:31:37 UTC (rev 3928)
+++ trunk/include/geos/geom/BinaryOp.h	2013-08-28 12:32:13 UTC (rev 3929)
@@ -446,8 +446,10 @@
 	// Try reducing precision
 	try
 	{
-		long unsigned int g0scale = g0->getFactory()->getPrecisionModel()->getScale();
-		long unsigned int g1scale = g1->getFactory()->getPrecisionModel()->getScale();
+		long unsigned int g0scale = 
+            static_cast<long unsigned int>(g0->getFactory()->getPrecisionModel()->getScale());
+		long unsigned int g1scale = 
+            static_cast<long unsigned int>(g1->getFactory()->getPrecisionModel()->getScale());
 
 #if GEOS_DEBUG_BINARYOP
 		std::cerr << "Original input scales are: "
@@ -505,6 +507,7 @@
 #if GEOS_DEBUG_BINARYOP
 		std::cerr << "Reduced: " << ex.what() << std::endl;
 #endif
+        ::geos::ignore_unused_variable_warning(ex);
 	}
 
 #endif