[geos-commits] r2766 - trunk/source/noding

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-12-03 14:14:49 -0500 (Thu, 03 Dec 2009)
New Revision: 2766

Modified:
   trunk/source/noding/OrientedCoordinateArray.cpp
   trunk/source/noding/ScaledNoder.cpp
Log:
Part 6 of larger changeset - source/noding:
* Declare noncopyable types as such explicitly (Ticket #304).
* Added Visual C++ pragmas.
* Tidy up.

Modified: trunk/source/noding/OrientedCoordinateArray.cpp
===================================================================
--- trunk/source/noding/OrientedCoordinateArray.cpp	2009-12-03 19:11:28 UTC (rev 2765)
+++ trunk/source/noding/OrientedCoordinateArray.cpp	2009-12-03 19:14:49 UTC (rev 2766)
@@ -1,95 +1,99 @@
-/**********************************************************************
- * $Id$
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.refractions.net
- *
- * Copyright (C) 2009    Sandro Santilli <strk at keybit.net>
- *
- * 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. 
- * See the COPYING file for more information.
- *
- **********************************************************************
- *
- * Last port: noding/OrientedCoordinateArray.java rev. 1.1 (JTS-1.9)
- *
- **********************************************************************/
-
-//#include <cmath>
-//#include <sstream>
-
-#include <geos/noding/OrientedCoordinateArray.h>
-
-//#include <geos/util/IllegalArgumentException.h>
-//#include <geos/noding/Octant.h>
-//#include <geos/geom/Coordinate.h>
-#include <geos/geom/CoordinateSequence.h>
-
-//using namespace std;
-using namespace geos::geom;
-
-namespace geos {
-namespace noding { // geos.noding
-
-/* private static */
-bool
-OrientedCoordinateArray::orientation(const CoordinateSequence& pts)
-{
-	return CoordinateSequence::increasingDirection(pts) == 1;
-}
-
-int
-OrientedCoordinateArray::compareTo(const OrientedCoordinateArray& oca) const
-{
-	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) {
-      System.out.println("bidir mismatch");
-
-      boolean orient1 = orientation(pts);
-      boolean orient2 = orientation(oca.pts);
-      int comp2 = compareOriented(pts, orientation,
-                               oca.pts, oca.orientation);
-      int oldComp2 = SegmentStringDissolver.ptsComp.compare(pts, oca.pts);
-    }
-#endif
-
-	return comp;
-}
-
-/* private static */
-int
-OrientedCoordinateArray::compareOriented(const geom::CoordinateSequence& pts1,
-                                     bool orientation1,
-                                     const geom::CoordinateSequence& pts2,
-                                     bool orientation2)
-{
-    int dir1 = orientation1 ? 1 : -1;
-    int dir2 = orientation2 ? 1 : -1;
-    int limit1 = orientation1 ? pts1.size() : -1;
-    int limit2 = orientation2 ? pts2.size() : -1;
-
-    int i1 = orientation1 ? 0 : pts1.size() - 1;
-    int i2 = orientation2 ? 0 : pts2.size() - 1;
-    //int comp = 0; // unused, but is in JTS ...
-    while (true) {
-      int compPt = pts1[i1].compareTo(pts2[i2]);
-      if (compPt != 0)
-        return compPt;
-      i1 += dir1;
-      i2 += dir2;
-      bool done1 = i1 == limit1;
-      bool done2 = i2 == limit2;
-      if (done1 && ! done2) return -1;
-      if (! done1 && done2) return 1;
-      if (done1 && done2) return 0;
-    }
-}
-
-} // namespace geos.noding
-} // namespace geos
-
+/**********************************************************************
+ * $Id$
+ *
+ * GEOS - Geometry Engine Open Source
+ * http://geos.refractions.net
+ *
+ * Copyright (C) 2009    Sandro Santilli <strk at keybit.net>
+ *
+ * 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. 
+ * See the COPYING file for more information.
+ *
+ **********************************************************************
+ *
+ * Last port: noding/OrientedCoordinateArray.java rev. 1.1 (JTS-1.9)
+ *
+ **********************************************************************/
+
+//#include <cmath>
+//#include <sstream>
+
+#include <geos/noding/OrientedCoordinateArray.h>
+
+//#include <geos/util/IllegalArgumentException.h>
+//#include <geos/noding/Octant.h>
+//#include <geos/geom/Coordinate.h>
+#include <geos/geom/CoordinateSequence.h>
+
+//using namespace std;
+using namespace geos::geom;
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4127)
+#endif
+
+namespace geos {
+namespace noding { // geos.noding
+
+/* private static */
+bool
+OrientedCoordinateArray::orientation(const CoordinateSequence& pts)
+{
+	return CoordinateSequence::increasingDirection(pts) == 1;
+}
+
+int
+OrientedCoordinateArray::compareTo(const OrientedCoordinateArray& oca) const
+{
+	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) {
+      System.out.println("bidir mismatch");
+
+      boolean orient1 = orientation(pts);
+      boolean orient2 = orientation(oca.pts);
+      int comp2 = compareOriented(pts, orientation,
+                               oca.pts, oca.orientation);
+      int oldComp2 = SegmentStringDissolver.ptsComp.compare(pts, oca.pts);
+    }
+#endif
+
+	return comp;
+}
+
+/* private static */
+int
+OrientedCoordinateArray::compareOriented(const geom::CoordinateSequence& pts1,
+                                     bool orientation1,
+                                     const geom::CoordinateSequence& pts2,
+                                     bool orientation2)
+{
+    int dir1 = orientation1 ? 1 : -1;
+    int dir2 = orientation2 ? 1 : -1;
+    int limit1 = orientation1 ? pts1.size() : -1;
+    int limit2 = orientation2 ? pts2.size() : -1;
+
+    int i1 = orientation1 ? 0 : pts1.size() - 1;
+    int i2 = orientation2 ? 0 : pts2.size() - 1;
+    //int comp = 0; // unused, but is in JTS ...
+    while (true) {
+      int compPt = pts1[i1].compareTo(pts2[i2]);
+      if (compPt != 0)
+        return compPt;
+      i1 += dir1;
+      i2 += dir2;
+      bool done1 = i1 == limit1;
+      bool done2 = i2 == limit2;
+      if (done1 && ! done2) return -1;
+      if (! done1 && done2) return 1;
+      if (done1 && done2) return 0;
+    }
+}
+
+} // namespace geos.noding
+} // namespace geos
+

Modified: trunk/source/noding/ScaledNoder.cpp
===================================================================
--- trunk/source/noding/ScaledNoder.cpp	2009-12-03 19:11:28 UTC (rev 2765)
+++ trunk/source/noding/ScaledNoder.cpp	2009-12-03 19:14:49 UTC (rev 2766)
@@ -73,7 +73,7 @@
 
 } // anonym namespace 
 
-class ScaledNoder::Scaler: public geom::CoordinateFilter {
+class ScaledNoder::Scaler : public geom::CoordinateFilter {
 public:
 	const ScaledNoder& sn;
 	Scaler(const ScaledNoder&n): sn(n)
@@ -91,6 +91,11 @@
 		c->x = util::round( ( c->x - sn.offsetX ) * sn.scaleFactor );
 		c->y = util::round( ( c->y - sn.offsetY ) * sn.scaleFactor );
 	}
+
+private:
+    // Declare type as noncopyable
+    ScaledNoder::Scaler(const ScaledNoder::Scaler& other);
+    ScaledNoder::Scaler& operator=(const ScaledNoder::Scaler& rhs);
 };
 
 class ScaledNoder::ReScaler: public geom::CoordinateFilter {
@@ -115,6 +120,11 @@
 		c->x = c->x / sn.scaleFactor + sn.offsetX;
 		c->y = c->y / sn.scaleFactor + sn.offsetY;
 	}
+
+private:
+    // Declare type as noncopyable
+    ScaledNoder::ReScaler(const ScaledNoder::ReScaler& other);
+    ScaledNoder::ReScaler& operator=(const ScaledNoder::ReScaler& rhs);
 };
 
 /*private*/