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

svn_geos at osgeo.org svn_geos at osgeo.org
Wed Dec 7 10:13:29 EST 2011


Author: strk
Date: 2011-12-07 07:13:29 -0800 (Wed, 07 Dec 2011)
New Revision: 3530

Modified:
   trunk/include/geos/noding/snapround/MCIndexPointSnapper.h
   trunk/include/geos/noding/snapround/MCIndexSnapRounder.h
   trunk/src/noding/snapround/MCIndexPointSnapper.cpp
   trunk/src/noding/snapround/MCIndexSnapRounder.cpp
Log:
Update port info for MCIndexPointSnapper and MCIndexSnapRounder

Modified: trunk/include/geos/noding/snapround/MCIndexPointSnapper.h
===================================================================
--- trunk/include/geos/noding/snapround/MCIndexPointSnapper.h	2011-12-07 11:17:58 UTC (rev 3529)
+++ trunk/include/geos/noding/snapround/MCIndexPointSnapper.h	2011-12-07 15:13:29 UTC (rev 3530)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: noding/snapround/MCIndexPointSnapper.java r320 (JTS-1.12)
+ * Last port: noding/snapround/MCIndexPointSnapper.java r486 (JTS-1.12+)
  *
  **********************************************************************/
 
@@ -89,22 +89,4 @@
 } // namespace geos::noding
 } // namespace geos
 
-//#ifdef GEOS_INLINE
-//# include "geos/noding/snapround/MCIndexPointSnapper.inl"
-//#endif
-
 #endif // GEOS_NODING_SNAPROUND_MCINDEXPOINTSNAPPER_H
-
-/**********************************************************************
- * $Log$
- * Revision 1.3  2006/03/24 09:52:41  strk
- * USE_INLINE => GEOS_INLINE
- *
- * Revision 1.2  2006/03/22 18:12:31  strk
- * indexChain.h header split.
- *
- * Revision 1.1  2006/03/14 12:55:56  strk
- * Headers split: geomgraphindex.h, nodingSnapround.h
- *
- **********************************************************************/
-

Modified: trunk/include/geos/noding/snapround/MCIndexSnapRounder.h
===================================================================
--- trunk/include/geos/noding/snapround/MCIndexSnapRounder.h	2011-12-07 11:17:58 UTC (rev 3529)
+++ trunk/include/geos/noding/snapround/MCIndexSnapRounder.h	2011-12-07 15:13:29 UTC (rev 3530)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: noding/snapround/MCIndexSnapRounder.java r480 (JTS-1.12)
+ * Last port: noding/snapround/MCIndexSnapRounder.java r486 (JTS-1.12+)
  *
  **********************************************************************/
 
@@ -155,14 +155,3 @@
 #endif
 
 #endif // GEOS_NODING_SNAPROUND_MCINDEXSNAPROUNDER_H
-
-/**********************************************************************
- * $Log$
- * Revision 1.2  2006/03/24 09:52:41  strk
- * USE_INLINE => GEOS_INLINE
- *
- * Revision 1.1  2006/03/14 12:55:56  strk
- * Headers split: geomgraphindex.h, nodingSnapround.h
- *
- **********************************************************************/
-

Modified: trunk/src/noding/snapround/MCIndexPointSnapper.cpp
===================================================================
--- trunk/src/noding/snapround/MCIndexPointSnapper.cpp	2011-12-07 11:17:58 UTC (rev 3529)
+++ trunk/src/noding/snapround/MCIndexPointSnapper.cpp	2011-12-07 15:13:29 UTC (rev 3530)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: noding/snapround/MCIndexPointSnapper.java r320 (JTS-1.12)
+ * Last port: noding/snapround/MCIndexPointSnapper.java r486 (JTS-1.12+)
  *
  **********************************************************************/
 
@@ -129,43 +129,3 @@
 } // namespace geos.noding
 } // namespace geos
 
-/**********************************************************************
- * $Log$
- * Revision 1.9  2006/03/24 09:25:02  strk
- * Bugs #77 and #76: missing <algorithm>
- *
- * Revision 1.8  2006/03/22 18:12:32  strk
- * indexChain.h header split.
- *
- * Revision 1.7  2006/03/15 09:51:13  strk
- * streamlined headers usage
- *
- * Revision 1.6  2006/03/14 12:55:56  strk
- * Headers split: geomgraphindex.h, nodingSnapround.h
- *
- * Revision 1.5  2006/02/21 16:53:49  strk
- * MCIndexPointSnapper, MCIndexSnapRounder
- *
- * Revision 1.4  2006/02/20 10:14:18  strk
- * - namespaces geos::index::*
- * - Doxygen documentation cleanup
- *
- * Revision 1.3  2006/02/19 19:46:49  strk
- * Packages <-> namespaces mapping for most GEOS internal code (uncomplete, but working). Dir-level libs for index/ subdirs.
- *
- * Revision 1.2  2006/02/18 21:08:09  strk
- * - new CoordinateSequence::applyCoordinateFilter method (slow but useful)
- * - SegmentString::getCoordinates() doesn't return a clone anymore.
- * - SegmentString::getCoordinatesRO() obsoleted.
- * - SegmentString constructor does not promises constness of passed
- *   CoordinateSequence anymore.
- * - NEW ScaledNoder class
- * - Stubs for MCIndexPointSnapper and  MCIndexSnapRounder
- * - Simplified internal interaces of OffsetCurveBuilder and OffsetCurveSetBuilder
- *
- * Revision 1.1  2006/02/14 13:28:26  strk
- * New SnapRounding code ported from JTS-1.7 (not complete yet).
- * Buffer op optimized by using new snaprounding code.
- * Leaks fixed in XMLTester.
- *
- **********************************************************************/

Modified: trunk/src/noding/snapround/MCIndexSnapRounder.cpp
===================================================================
--- trunk/src/noding/snapround/MCIndexSnapRounder.cpp	2011-12-07 11:17:58 UTC (rev 3529)
+++ trunk/src/noding/snapround/MCIndexSnapRounder.cpp	2011-12-07 15:13:29 UTC (rev 3530)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: noding/snapround/MCIndexSnapRounder.java r480 (JTS-1.12)
+ * Last port: noding/snapround/MCIndexSnapRounder.java r486 (JTS-1.12+)
  *
  **********************************************************************/
 
@@ -112,7 +112,7 @@
 {
 	nodedSegStrings = inputSegmentStrings;
 	MCIndexNoder noder;
-	pointSnapper.release(); // let it leak
+	pointSnapper.release(); // let it leak ?!
 	pointSnapper.reset(new MCIndexPointSnapper(noder.getIndex()));
 	snapRound(noder, inputSegmentStrings);
 
@@ -144,58 +144,3 @@
 } // namespace geos.noding
 } // namespace geos
 
-/**********************************************************************
- * $Log$
- * Revision 1.11  2006/05/05 15:40:39  strk
- * Had nodind validation error throw an exception for SimpleSnapRounder
- * and MCIndexSnapRounder
- *
- * Revision 1.10  2006/04/03 10:44:19  strk
- * Added missing headers
- *
- * Revision 1.9  2006/03/24 09:52:41  strk
- * USE_INLINE => GEOS_INLINE
- *
- * Revision 1.8  2006/03/22 18:12:32  strk
- * indexChain.h header split.
- *
- * Revision 1.7  2006/03/14 12:55:56  strk
- * Headers split: geomgraphindex.h, nodingSnapround.h
- *
- * Revision 1.6  2006/03/03 10:46:21  strk
- * Removed 'using namespace' from headers, added missing headers in .cpp files, removed useless includes in headers (bug#46)
- *
- * Revision 1.5  2006/02/23 11:54:20  strk
- * - MCIndexPointSnapper
- * - MCIndexSnapRounder
- * - SnapRounding BufferOp
- * - ScaledNoder
- * - GEOSException hierarchy cleanups
- * - SpatialIndex memory-friendly query interface
- * - GeometryGraph::getBoundaryNodes memory-friendly
- * - NodeMap::getBoundaryNodes memory-friendly
- * - Cleanups in geomgraph::Edge
- * - Added an XML test for snaprounding buffer (shows leaks, working on it)
- *
- * Revision 1.4  2006/02/21 16:53:49  strk
- * MCIndexPointSnapper, MCIndexSnapRounder
- *
- * Revision 1.3  2006/02/19 19:46:49  strk
- * Packages <-> namespaces mapping for most GEOS internal code (uncomplete, but working). Dir-level libs for index/ subdirs.
- *
- * Revision 1.2  2006/02/18 21:08:09  strk
- * - new CoordinateSequence::applyCoordinateFilter method (slow but useful)
- * - SegmentString::getCoordinates() doesn't return a clone anymore.
- * - SegmentString::getCoordinatesRO() obsoleted.
- * - SegmentString constructor does not promises constness of passed
- *   CoordinateSequence anymore.
- * - NEW ScaledNoder class
- * - Stubs for MCIndexPointSnapper and  MCIndexSnapRounder
- * - Simplified internal interaces of OffsetCurveBuilder and OffsetCurveSetBuilder
- *
- * Revision 1.1  2006/02/14 13:28:26  strk
- * New SnapRounding code ported from JTS-1.7 (not complete yet).
- * Buffer op optimized by using new snaprounding code.
- * Leaks fixed in XMLTester.
- *
- **********************************************************************/



More information about the geos-commits mailing list