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

[svn_geos at osgeo.org]

Author: strk
Date: 2011-05-17 10:04:47 -0700 (Tue, 17 May 2011)
New Revision: 3368

Removed:
   trunk/include/geos/noding/snapround/MCIndexSnapRounder.inl
Modified:
   trunk/include/geos/noding/snapround/MCIndexSnapRounder.h
   trunk/include/geos/noding/snapround/Makefile.am
   trunk/src/inlines.cpp
Log:
Remove inlines machinery from MCIndexSnapRounder. Possibly fixes ticket #222.

Modified: trunk/include/geos/noding/snapround/MCIndexSnapRounder.h
===================================================================
--- trunk/include/geos/noding/snapround/MCIndexSnapRounder.h	2011-05-17 16:50:03 UTC (rev 3367)
+++ trunk/include/geos/noding/snapround/MCIndexSnapRounder.h	2011-05-17 17:04:47 UTC (rev 3368)
@@ -23,9 +23,11 @@
 #include <geos/export.h>
 
 #include <geos/noding/Noder.h> // for inheritance
+#include <geos/noding/NodedSegmentString.h> // for inlines
+#include <geos/noding/snapround/MCIndexPointSnapper.h> // for inines
 #include <geos/algorithm/LineIntersector.h> // for composition
 #include <geos/geom/Coordinate.h> // for use in vector
-#include <geos/inline.h>
+#include <geos/geom/PrecisionModel.h> // for inlines
 
 #include <vector>
 
@@ -36,20 +38,12 @@
 
 // Forward declarations
 namespace geos {
-	namespace geom {
-		class PrecisionModel;
-	}
 	namespace algorithm {
 		class LineIntersector;
 	}
 	namespace noding {
 		class SegmentString;
-		class NodedSegmentString;
 		class MCIndexNoder;
-		namespace snapround {
-			//class HotPixel;
-			class MCIndexPointSnapper;
-		}
 	}
 }
 
@@ -82,9 +76,16 @@
 
 public:
 
-	MCIndexSnapRounder(geom::PrecisionModel& nPm);
+	MCIndexSnapRounder(geom::PrecisionModel& nPm)
+    :
+		pm(nPm),
+		scaleFactor(nPm.getScale()),
+		pointSnapper(0)
+  {}
 
-	std::vector<SegmentString*>* getNodedSubstrings() const;
+	std::vector<SegmentString*>* getNodedSubstrings() const {
+	  return NodedSegmentString::getNodedSubstrings(*nodedSegStrings);
+  }
 
 	void computeNodes(std::vector<SegmentString*>* segStrings);
  
@@ -152,10 +153,6 @@
 #pragma warning(pop)
 #endif
 
-#ifdef GEOS_INLINE
-# include <geos/noding/snapround/MCIndexSnapRounder.inl>
-#endif
-
 #endif // GEOS_NODING_SNAPROUND_MCINDEXSNAPROUNDER_H
 
 /**********************************************************************

Deleted: trunk/include/geos/noding/snapround/MCIndexSnapRounder.inl
===================================================================
--- trunk/include/geos/noding/snapround/MCIndexSnapRounder.inl	2011-05-17 16:50:03 UTC (rev 3367)
+++ trunk/include/geos/noding/snapround/MCIndexSnapRounder.inl	2011-05-17 17:04:47 UTC (rev 3368)
@@ -1,54 +0,0 @@
-/**********************************************************************
- * $Id$
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.refractions.net
- *
- * Copyright (C) 2005-2006 Refractions Research Inc.
- *
- * 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/snapround/MCIndexSnapRounder.java r320 (JTS-1.12)
- *
- **********************************************************************/
-
-#ifndef GEOS_NODING_SNAPROUND_MCINDEXSNAPROUNDER_INL
-#define GEOS_NODING_SNAPROUND_MCINDEXSNAPROUNDER_INL
-
-#include <geos/noding/snapround/MCIndexSnapRounder.h>
-#include <geos/noding/snapround/MCIndexPointSnapper.h>
-#include <geos/noding/SegmentString.h>
-#include <geos/noding/NodedSegmentString.h>
-#include <geos/geom/PrecisionModel.h>
-
-#include <memory>
-
-namespace geos {
-namespace noding { // geos::noding
-namespace snapround { // geos::noding::snapround
-
-INLINE std::vector<SegmentString*>*
-MCIndexSnapRounder::getNodedSubstrings() const
-{
-	return NodedSegmentString::getNodedSubstrings(*nodedSegStrings);
-}
-
-INLINE
-MCIndexSnapRounder::MCIndexSnapRounder(geom::PrecisionModel& nPm)
-		:
-		pm(nPm),
-		scaleFactor(nPm.getScale()),
-		pointSnapper(0)
-{}
-
-} // namespace geos::noding::snapround
-} // namespace geos::noding
-} // namespace geos
-
-#endif // GEOS_NODING_SNAPROUND_MCINDEXSNAPROUNDER_INL
-

Modified: trunk/include/geos/noding/snapround/Makefile.am
===================================================================
--- trunk/include/geos/noding/snapround/Makefile.am	2011-05-17 16:50:03 UTC (rev 3367)
+++ trunk/include/geos/noding/snapround/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
@@ -13,5 +13,4 @@
     HotPixel.inl \
     MCIndexPointSnapper.h \
     MCIndexSnapRounder.h \
-    MCIndexSnapRounder.inl \
     SimpleSnapRounder.h

Modified: trunk/src/inlines.cpp
===================================================================
--- trunk/src/inlines.cpp	2011-05-17 16:50:03 UTC (rev 3367)
+++ trunk/src/inlines.cpp	2011-05-17 17:04:47 UTC (rev 3368)
@@ -59,7 +59,6 @@
 #include <geos/geom/CoordinateArraySequenceFactory.inl>
 #include <geos/noding/SegmentString.inl>
 #include <geos/noding/snapround/HotPixel.inl>
-#include <geos/noding/snapround/MCIndexSnapRounder.inl>
 #include <geos/noding/MCIndexNoder.inl>
 
 #endif // defined __CYGWIN__