[geos-commits] r3589 - in trunk: include/geos/noding src/noding

[svn_geos at osgeo.org]

Author: strk
Date: 2012-04-05 03:30:29 -0700 (Thu, 05 Apr 2012)
New Revision: 3589

Modified:
   trunk/include/geos/noding/OrientedCoordinateArray.h
   trunk/src/noding/OrientedCoordinateArray.cpp
Log:
Make OrientedCoordinateArray assignable

Modified: trunk/include/geos/noding/OrientedCoordinateArray.h
===================================================================
--- trunk/include/geos/noding/OrientedCoordinateArray.h	2012-04-03 14:23:23 UTC (rev 3588)
+++ trunk/include/geos/noding/OrientedCoordinateArray.h	2012-04-05 10:30:29 UTC (rev 3589)
@@ -55,7 +55,7 @@
 	 */
 	OrientedCoordinateArray(const geom::CoordinateSequence& pts)
 		:
-		pts(pts),
+		pts(&pts),
 		orientationVar(orientation(pts))
 	{
 	}
@@ -92,7 +92,7 @@
 	static bool orientation(const geom::CoordinateSequence& pts);
 
 	/// Externally owned
-	const geom::CoordinateSequence& pts;
+	const geom::CoordinateSequence* pts;
 
 	bool orientationVar;
 

Modified: trunk/src/noding/OrientedCoordinateArray.cpp
===================================================================
--- trunk/src/noding/OrientedCoordinateArray.cpp	2012-04-03 14:23:23 UTC (rev 3588)
+++ trunk/src/noding/OrientedCoordinateArray.cpp	2012-04-05 10:30:29 UTC (rev 3589)
@@ -46,8 +46,8 @@
 int
 OrientedCoordinateArray::compareTo(const OrientedCoordinateArray& oca) const
 {
-	int comp = compareOriented(pts, orientationVar,
-                               oca.pts, oca.orientationVar);
+	int comp = compareOriented(*pts, orientationVar,
+                               *oca.pts, oca.orientationVar);
 #if 0 // MD - testing only
     int oldComp = SegmentStringDissolver.ptsComp.compare(pts, oca.pts);
     if ((oldComp == 0 || comp == 0) && oldComp != comp) {