[geos-commits] r4165 - in trunk: src/operation/buffer tests/unit/geom

[svn_geos at osgeo.org]

Author: mloskot
Date: 2016-03-06 00:29:21 -0800 (Sun, 06 Mar 2016)
New Revision: 4165

Modified:
   trunk/src/operation/buffer/BufferBuilder.cpp
   trunk/tests/unit/geom/GeometryFactoryTest.cpp
Log:
Clean up some compiler warnings on truncating conversions between size_t and double or unsigned in 

Modified: trunk/src/operation/buffer/BufferBuilder.cpp
===================================================================
--- trunk/src/operation/buffer/BufferBuilder.cpp	2016-03-06 00:04:20 UTC (rev 4164)
+++ trunk/src/operation/buffer/BufferBuilder.cpp	2016-03-06 08:29:21 UTC (rev 4165)
@@ -202,7 +202,7 @@
    std::vector< Geometry* >* singleSidedNodedEdges =
       new std::vector< Geometry * >();
    singleSidedNodedEdges->reserve(nodedEdges->size());
-   for ( unsigned int i = 0, n = nodedEdges->size(); i < n; ++i )
+   for ( std::size_t i = 0, n = nodedEdges->size(); i < n; ++i )
    {
       SegmentString* ss = ( *nodedEdges )[i];
 

Modified: trunk/tests/unit/geom/GeometryFactoryTest.cpp
===================================================================
--- trunk/tests/unit/geom/GeometryFactoryTest.cpp	2016-03-06 00:04:20 UTC (rev 4164)
+++ trunk/tests/unit/geom/GeometryFactoryTest.cpp	2016-03-06 08:29:21 UTC (rev 4165)
@@ -1125,8 +1125,8 @@
 			const std::size_t factor = i * i;
 			CoordArrayPtr coords = new geos::geom::CoordinateArraySequence(lineSize);
 			ensure( coords != 0 );
-			coords->setAt(Coordinate(0 + factor, 0 + factor), 0);
-			coords->setAt(Coordinate(5 + factor, 5 + factor), 1);
+			coords->setAt(Coordinate(0. + factor, 0. + factor), 0);
+			coords->setAt(Coordinate(5. + factor, 5. + factor), 1);
 			ensure_equals( coords->getSize(), lineSize );
 
 			LineStringPtr line = factory_->createLineString(coords);
@@ -1167,8 +1167,8 @@
 			const std::size_t factor = i * i;
 			CoordArrayPtr coords = new geos::geom::CoordinateArraySequence(lineSize);
 			ensure( coords != 0 );
-			coords->setAt(Coordinate(0 + factor, 0 + factor), 0);
-			coords->setAt(Coordinate(5 + factor, 5 + factor), 1);
+			coords->setAt(Coordinate(0. + factor, 0. + factor), 0);
+			coords->setAt(Coordinate(5. + factor, 5. + factor), 1);
 			ensure_equals( coords->getSize(), lineSize );
 
 			LineStringPtr line = factory_->createLineString(coords);