[geos-commits] r4152 - in trunk: capi src/operation/intersection src/operation/overlay

[svn_geos at osgeo.org]

Author: mloskot
Date: 2016-02-29 08:20:44 -0800 (Mon, 29 Feb 2016)
New Revision: 4152

Modified:
   trunk/capi/geos_ts_c.cpp
   trunk/src/operation/intersection/RectangleIntersectionBuilder.cpp
   trunk/src/operation/overlay/PolygonBuilder.cpp
Log:
Fix build with preprocessor symbol GEOS_DEBUG defined.

Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp	2016-02-24 11:51:00 UTC (rev 4151)
+++ trunk/capi/geos_ts_c.cpp	2016-02-29 16:20:44 UTC (rev 4152)
@@ -3134,8 +3134,7 @@
 
 #ifdef GEOS_DEBUG
     char buf[256];
-    sprintf(buf, "createCollection: requested type %d, ngeoms: %d",
-            type, ngeoms);
+    sprintf(buf, "createCollection: requested type %d", type);
     handle->NOTICE_MESSAGE("%s", buf);// TODO: Can handle->NOTICE_MESSAGE format that directly? 
 #endif
 

Modified: trunk/src/operation/intersection/RectangleIntersectionBuilder.cpp
===================================================================
--- trunk/src/operation/intersection/RectangleIntersectionBuilder.cpp	2016-02-24 11:51:00 UTC (rev 4151)
+++ trunk/src/operation/intersection/RectangleIntersectionBuilder.cpp	2016-02-29 16:20:44 UTC (rev 4152)
@@ -509,9 +509,6 @@
     delete ol;
   }
   lines = new_lines;
-#if GEOS_DEBUG
-  std::cout << "After lines reverse, parts are " << *this << std::endl;
-#endif
 }
 
 

Modified: trunk/src/operation/overlay/PolygonBuilder.cpp
===================================================================
--- trunk/src/operation/overlay/PolygonBuilder.cpp	2016-02-24 11:51:00 UTC (rev 4151)
+++ trunk/src/operation/overlay/PolygonBuilder.cpp	2016-02-29 16:20:44 UTC (rev 4152)
@@ -148,7 +148,7 @@
 	cerr << "  dirEdge " << i << endl
 	     << de->printEdge() << endl
 	     << " inResult:" << de->isInResult() << endl
-	     << " isArea:" << de->getLabel()->isArea() << endl;
+	     << " isArea:" << de->getLabel().isArea() << endl;
 #endif
 		if (de->isInResult() && de->getLabel().isArea())
 		{