[geos-commits] r4333 - in trunk/src: algorithm operation/overlay

[Sandro Santilli]

Author: strk
Date: 2017-02-14 08:27:33 -0800 (Tue, 14 Feb 2017)
New Revision: 4333

Modified:
   trunk/src/algorithm/LineIntersector.cpp
   trunk/src/operation/overlay/OverlayOp.cpp
Log:
Remove trailing blanks

Modified: trunk/src/algorithm/LineIntersector.cpp
===================================================================
--- trunk/src/algorithm/LineIntersector.cpp	2017-02-01 17:30:58 UTC (rev 4332)
+++ trunk/src/algorithm/LineIntersector.cpp	2017-02-14 16:27:33 UTC (rev 4333)
@@ -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.
  *
  **********************************************************************
@@ -33,7 +33,7 @@
 #include <algorithm> // for max()
 #include <string>
 #include <cmath> // for fabs()
-#include <cassert> 
+#include <cassert>
 
 
 #ifndef GEOS_DEBUG
@@ -404,7 +404,7 @@
 	int Pq1=CGAlgorithms::orientationIndex(p1,p2,q1);
 	int Pq2=CGAlgorithms::orientationIndex(p1,p2,q2);
 
-	if ((Pq1>0 && Pq2>0) || (Pq1<0 && Pq2<0)) 
+	if ((Pq1>0 && Pq2>0) || (Pq1<0 && Pq2<0))
 	{
 #if GEOS_DEBUG
 		cerr<<" NO_INTERSECTION"<<endl;
@@ -455,16 +455,16 @@
 		/* Check for two equal endpoints.
 		 * This is done explicitly rather than by the orientation tests
 		 * below in order to improve robustness.
-		 * 
+		 *
 		 * (A example where the orientation tests fail
 		 *  to be consistent is:
-		 * 
+		 *
 		 * LINESTRING ( 19.850257749638203 46.29709338043669,
 		 * 			20.31970698357233 46.76654261437082 )
 		 * and
 		 * LINESTRING ( -48.51001596420236 -22.063180333403878,
 		 * 			19.850257749638203 46.29709338043669 )
-		 * 
+		 *
 		 * which used to produce the result:
 		 * (20.31970698357233, 46.76654261437082, NaN)
 		 */
@@ -772,7 +772,7 @@
 		     << intPt.toString() << endl;
 #endif
 	}
- 
+
 	if (precisionModel!=NULL) {
 		precisionModel->makePrecise(intPt);
 	}
@@ -848,17 +848,17 @@
 	double minY0 = n00.y < n01.y ? n00.y : n01.y;
 	double maxX0 = n00.x > n01.x ? n00.x : n01.x;
 	double maxY0 = n00.y > n01.y ? n00.y : n01.y;
-	
+
 	double minX1 = n10.x < n11.x ? n10.x : n11.x;
 	double minY1 = n10.y < n11.y ? n10.y : n11.y;
 	double maxX1 = n10.x > n11.x ? n10.x : n11.x;
 	double maxY1 = n10.y > n11.y ? n10.y : n11.y;
-	
+
 	double intMinX = minX0 > minX1 ? minX0 : minX1;
 	double intMaxX = maxX0 < maxX1 ? maxX0 : maxX1;
 	double intMinY = minY0 > minY1 ? minY0 : minY1;
 	double intMaxY = maxY0 < maxY1 ? maxY0 : maxY1;
-	
+
 	double intMidX = (intMinX + intMaxX) / 2.0;
 	double intMidY = (intMinY + intMaxY) / 2.0;
 

Modified: trunk/src/operation/overlay/OverlayOp.cpp
===================================================================
--- trunk/src/operation/overlay/OverlayOp.cpp	2017-02-01 17:30:58 UTC (rev 4332)
+++ trunk/src/operation/overlay/OverlayOp.cpp	2017-02-14 16:27:33 UTC (rev 4333)
@@ -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.
  *
  ***********************************************************************
@@ -117,7 +117,7 @@
 		case opDIFFERENCE:
 			return loc0==Location::INTERIOR && loc1!=Location::INTERIOR;
 		case opSYMDIFFERENCE:
-			return (loc0==Location::INTERIOR && loc1!=Location::INTERIOR) 
+			return (loc0==Location::INTERIOR && loc1!=Location::INTERIOR)
 				|| (loc0!=Location::INTERIOR && loc1==Location::INTERIOR);
 	}
 	return false;
@@ -200,7 +200,7 @@
     }
 #if GEOS_DEBUG
 		cerr <<" "<< e->print() << endl;
-#endif 
+#endif
     insertUniqueEdge(e);
   }
 /*
@@ -229,7 +229,7 @@
 
 			// should we keep this alive some more ?
 			delete e;
-		} 
+		}
 	}
 }
 
@@ -513,7 +513,7 @@
 	for(size_t i=1, size=pts->size(); i<size; ++i)
 	{
 		const Coordinate &p0=pts->getAt(i-1);
-		const Coordinate &p1=pts->getAt(i);	
+		const Coordinate &p1=pts->getAt(i);
 		li.computeIntersection(p, p0, p1);
 		if (li.hasIntersection())
 		{
@@ -659,7 +659,7 @@
 	geomList->insert(geomList->end(),
 			nResultPolyList->begin(),
 			nResultPolyList->end());
-			
+
 	// build the most specific geometry possible
 	Geometry *g=geomFact->buildGeometry(geomList);
 	return g;
@@ -753,13 +753,13 @@
 	 */
   try
   {
-#ifdef GEOS_DEBUG_VALIDATION 
+#ifdef GEOS_DEBUG_VALIDATION
 		cout << "EdgeNodingValidator about to evaluate " << edgeList.getEdges().size() << " edges" << endl;
 #endif
     // Will throw TopologyException if noding is
     // found to be invalid
     EdgeNodingValidator::checkValid(edgeList.getEdges());
-#ifdef GEOS_DEBUG_VALIDATION 
+#ifdef GEOS_DEBUG_VALIDATION
 		cout << "EdgeNodingValidator accepted the noding" << endl;
 #endif
   }
@@ -771,7 +771,7 @@
 
     // In the error scenario, the edgeList is not properly
     // deleted. Cannot add to the destructor of EdgeList
-    // (as it should) because 
+    // (as it should) because
     // "graph.addEdges(edgeList.getEdges());" below
     // takes over edgeList ownership in the success case.
     edgeList.clearList();
@@ -810,7 +810,7 @@
 	GEOS_CHECK_FOR_INTERRUPTS();
 
 	PolygonBuilder polyBuilder(geomFact);
-	
+
 	// might throw a TopologyException *
 	polyBuilder.add(&graph);
 
@@ -839,7 +839,7 @@
 #if USE_ELEVATION_MATRIX
 	elevationMatrix->elevate(resultGeom);
 #endif // USE_ELEVATION_MATRIX
-	
+
 }
 
 /*protected*/
@@ -1008,7 +1008,7 @@
 		}
 	}
 
-	else if ( opCode == opDIFFERENCE 
+	else if ( opCode == opDIFFERENCE
 		&& arg[0]->getGeometry()->getDimension() == Dimension::A
 		&& arg[1]->getGeometry()->getDimension() == Dimension::A )
 	{