[geos-commits] r3452 - in trunk: include/geos/noding src/noding
svn_geos at osgeo.org
svn_geos at osgeo.org
Tue Jul 26 12:36:43 EDT 2011
Author: strk
Date: 2011-07-26 09:36:42 -0700 (Tue, 26 Jul 2011)
New Revision: 3452
Removed:
trunk/include/geos/noding/SegmentString.inl
Modified:
trunk/include/geos/noding/Makefile.am
trunk/include/geos/noding/SegmentString.h
trunk/src/noding/SegmentString.cpp
Log:
Update class documentation and port info. Drop empty .inl file.
Modified: trunk/include/geos/noding/Makefile.am
===================================================================
--- trunk/include/geos/noding/Makefile.am 2011-07-26 16:23:30 UTC (rev 3451)
+++ trunk/include/geos/noding/Makefile.am 2011-07-26 16:36:42 UTC (rev 3452)
@@ -32,7 +32,6 @@
SegmentPointComparator.h \
SegmentSetMutualIntersector.h \
SegmentString.h \
- SegmentString.inl \
SegmentStringUtil.h \
SimpleNoder.h \
SingleInteriorIntersectionFinder.h \
Modified: trunk/include/geos/noding/SegmentString.h
===================================================================
--- trunk/include/geos/noding/SegmentString.h 2011-07-26 16:23:30 UTC (rev 3451)
+++ trunk/include/geos/noding/SegmentString.h 2011-07-26 16:36:42 UTC (rev 3452)
@@ -1,10 +1,11 @@
/**********************************************************************
- * $Id$
*
* GEOS - Geometry Engine Open Source
* http://geos.refractions.net
*
- * Copyright (C) 2006 Refractions Research Inc.
+ * Copyright (C) 2011 Sandro Santilli <strk at keybit.net>
+ * Copyright (C) 2005-2006 Refractions Research Inc.
+ * Copyright (C) 2001-2002 Vivid Solutions Inc.
*
* This is free software; you can redistribute and/or modify it under
* the terms of the GNU Lesser General Public Licence as published
@@ -13,7 +14,7 @@
*
**********************************************************************
*
- * Last port: noding/SegmentString.java rev. 1.6 (JTS-1.9)
+ * Last port: noding/SegmentString.java r430 (JTS-1.12+)
*
**********************************************************************/
@@ -22,7 +23,6 @@
#include <geos/export.h>
#include <geos/noding/SegmentNodeList.h>
-#include <geos/inline.h>
#include <vector>
@@ -85,14 +85,10 @@
/// Return a pointer to the CoordinateSequence associated
/// with this SegmentString.
//
- /// Note that the CoordinateSequence is not owned by
- /// this SegmentString!
+ /// Note that the CoordinateSequence is owned by this SegmentString!
///
virtual geom::CoordinateSequence* getCoordinates() const=0;
- // Return a read-only pointer to this SegmentString CoordinateSequence
- //const CoordinateSequence* getCoordinatesRO() const { return pts; }
-
virtual bool isClosed() const=0;
virtual std::ostream& print(std::ostream& os) const;
@@ -111,44 +107,5 @@
} // namespace geos.noding
} // namespace geos
-#ifdef GEOS_INLINE
-# include "geos/noding/SegmentString.inl"
#endif
-#endif
-
-/**********************************************************************
- * $Log$
- * Revision 1.10 2006/05/05 14:25:05 strk
- * moved getSegmentOctant out of .inl into .cpp, renamed private eiList to nodeList as in JTS, added more assertion checking and fixed doxygen comments
- *
- * Revision 1.9 2006/05/05 10:19:06 strk
- * droppped SegmentString::getContext(), new name is getData() to reflect change in JTS
- *
- * Revision 1.8 2006/05/04 08:29:07 strk
- * * source/noding/ScaledNoder.cpp: removed use of SegmentString::setCoordinates().
- * * source/headers/geos/noding/SegmentStrign.{h,inl}: removed new setCoordinates() interface.
- *
- * Revision 1.7 2006/05/04 07:43:44 strk
- * output operator for SegmentString class
- *
- * Revision 1.6 2006/05/03 18:04:49 strk
- * added SegmentString::setCoordinates() interface
- *
- * Revision 1.5 2006/05/03 16:19:39 strk
- * fit in 80 columns
- *
- * Revision 1.4 2006/05/03 15:26:02 strk
- * testInvariant made public and always inlined
- *
- * Revision 1.3 2006/03/24 09:52:41 strk
- * USE_INLINE => GEOS_INLINE
- *
- * Revision 1.2 2006/03/13 21:14:24 strk
- * Added missing forward declarations
- *
- * Revision 1.1 2006/03/09 16:46:49 strk
- * geos::geom namespace definition, first pass at headers split
- *
- **********************************************************************/
-
Deleted: trunk/include/geos/noding/SegmentString.inl
===================================================================
--- trunk/include/geos/noding/SegmentString.inl 2011-07-26 16:23:30 UTC (rev 3451)
+++ trunk/include/geos/noding/SegmentString.inl 2011-07-26 16:36:42 UTC (rev 3452)
@@ -1,37 +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/SegmentString.java rev. 1.6 (JTS-1.9)
- *
- **********************************************************************/
-
-#ifndef GEOS_NODING_SEGMENTSTRING_INL
-#define GEOS_NODING_SEGMENTSTRING_INL
-
-#include <geos/noding/SegmentString.h>
-#include <geos/geom/Coordinate.h>
-
-#include <cassert>
-
-namespace geos {
-namespace noding { // geos.noding
-
-
-
-} // namespace geos.noding
-} // namespace geos
-
-#endif // GEOS_NODING_SEGMENTSTRING_INL
-
Modified: trunk/src/noding/SegmentString.cpp
===================================================================
--- trunk/src/noding/SegmentString.cpp 2011-07-26 16:23:30 UTC (rev 3451)
+++ trunk/src/noding/SegmentString.cpp 2011-07-26 16:36:42 UTC (rev 3452)
@@ -1,9 +1,10 @@
/**********************************************************************
- * $Id$
*
* GEOS - Geometry Engine Open Source
* http://geos.refractions.net
*
+ * Copyright (C) 2011 Sandro Santilli <strk at keybit.net>
+ * Copyright (C) 2005-2006 Refractions Research Inc.
* Copyright (C) 2001-2002 Vivid Solutions Inc.
*
* This is free software; you can redistribute and/or modify it under
@@ -13,7 +14,7 @@
*
**********************************************************************
*
- * Last port: noding/SegmentString.java rev. 1.6 (JTS-1.9)
+ * Last port: noding/SegmentString.java r430 (JTS-1.12+)
*
**********************************************************************/
@@ -30,10 +31,6 @@
#define GEOS_DEBUG 0
#endif
-#ifndef GEOS_INLINE
-# include "geos/noding/SegmentString.inl"
-#endif
-
#include <iostream>
#include <sstream>
@@ -58,152 +55,3 @@
} // namespace geos.noding
} // namespace geos
-/**********************************************************************
- * $Log$
- * Revision 1.30 2006/05/05 14:25:05 strk
- * moved getSegmentOctant out of .inl into .cpp, renamed private eiList to nodeList as in JTS, added more assertion checking and fixed doxygen comments
- *
- * Revision 1.29 2006/05/04 07:43:44 strk
- * output operator for SegmentString class
- *
- * Revision 1.28 2006/03/24 09:52:41 strk
- * USE_INLINE => GEOS_INLINE
- *
- * Revision 1.27 2006/03/15 09:51:12 strk
- * streamlined headers usage
- *
- * Revision 1.26 2006/03/09 16:46:49 strk
- * geos::geom namespace definition, first pass at headers split
- *
- * Revision 1.25 2006/03/02 12:12:00 strk
- * Renamed DEBUG macros to GEOS_DEBUG, all wrapped in #ifndef block to allow global override (bug#43)
- *
- * Revision 1.24 2006/02/28 17:44:27 strk
- * Added a check in SegmentNode::addSplitEdge to prevent attempts
- * to build SegmentString with less then 2 points.
- * This is a temporary fix for the buffer.xml assertion failure, temporary
- * as Martin Davis review would really be needed there.
- *
- * Revision 1.23 2006/02/28 14:34:05 strk
- * Added many assertions and debugging output hunting for a bug in BufferOp
- *
- * Revision 1.22 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.21 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.20 2006/02/15 14:59:08 strk
- * JTS-1.7 sync for:
- * noding/SegmentNode.cpp
- * noding/SegmentNodeList.cpp
- * noding/SegmentString.cpp
- *
- * Revision 1.19 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.
- *
- * Revision 1.18 2006/01/31 19:07:34 strk
- * - Renamed DefaultCoordinateSequence to CoordinateArraySequence.
- * - Moved GetNumGeometries() and GetGeometryN() interfaces
- * from GeometryCollection to Geometry class.
- * - Added getAt(int pos, Coordinate &to) funtion to CoordinateSequence class.
- * - Reworked automake scripts to produce a static lib for each subdir and
- * then link all subsystem's libs togheter
- * - Moved C-API in it's own top-level dir capi/
- * - Moved source/bigtest and source/test to tests/bigtest and test/xmltester
- * - Fixed PointLocator handling of LinearRings
- * - Changed CoordinateArrayFilter to reduce memory copies
- * - Changed UniqueCoordinateArrayFilter to reduce memory copies
- * - Added CGAlgorithms::isPointInRing() version working with
- * Coordinate::ConstVect type (faster!)
- * - Ported JTS-1.7 version of ConvexHull with big attention to
- * memory usage optimizations.
- * - Improved XMLTester output and user interface
- * - geos::geom::util namespace used for geom/util stuff
- * - Improved memory use in geos::geom::util::PolygonExtractor
- * - New ShortCircuitedGeometryVisitor class
- * - New operation/predicate package
- *
- * Revision 1.17 2005/12/08 01:39:28 strk
- * SegmentString::eiList made a real object rather then a pointer.
- * Adde getter for const and non-const references of it (dropping get by pointer)
- *
- * Revision 1.16 2005/02/22 18:21:46 strk
- * Changed SegmentNode to contain a *real* Coordinate (not a pointer) to reduce
- * construction costs.
- *
- * Revision 1.15 2005/02/22 16:23:28 strk
- * Cached number of points in CoordinateSequence.
- *
- * Revision 1.14 2005/02/22 15:49:20 strk
- * Reduced calls to CoordinateArraySequence->getSize().
- *
- * Revision 1.13 2005/02/05 05:44:47 strk
- * Changed geomgraph nodeMap to use Coordinate pointers as keys, reduces
- * lots of other Coordinate copies.
- *
- * Revision 1.12 2005/02/01 14:18:36 strk
- * More profiler labels
- *
- * Revision 1.11 2004/12/08 13:54:43 strk
- * gcc warnings checked and fixed, general cleanups.
- *
- * Revision 1.10 2004/11/01 16:43:04 strk
- * Added Profiler code.
- * Temporarly patched a bug in DoubleBits (must check drawbacks).
- * Various cleanups and speedups.
- *
- * Revision 1.9 2004/07/08 19:34:49 strk
- * Mirrored JTS interface of CoordinateSequence, factory and
- * default implementations.
- * Added CoordinateArraySequenceFactory::instance() function.
- *
- * Revision 1.8 2004/07/02 13:28:27 strk
- * Fixed all #include lines to reflect headers layout change.
- * Added client application build tips in README.
- *
- * Revision 1.7 2004/07/01 14:12:44 strk
- *
- * Geometry constructors come now in two flavors:
- * - deep-copy args (pass-by-reference)
- * - take-ownership of args (pass-by-pointer)
- * Same functionality is available through GeometryFactory,
- * including buildGeometry().
- *
- * Revision 1.6 2004/06/16 13:13:25 strk
- * Changed interface of SegmentString, now copying CoordinateSequence argument.
- * Fixed memory leaks associated with this and MultiGeometry constructors.
- * Other associated fixes.
- *
- * Revision 1.5 2004/05/27 10:27:03 strk
- * Memory leaks fixed.
- *
- * Revision 1.4 2004/05/07 07:57:27 strk
- * Added missing EdgeNodingValidator to build scripts.
- * Changed SegmentString constructor back to its original form
- * (takes const void *), implemented local tracking of "contexts"
- * in caller objects for proper destruction.
- *
- * Revision 1.3 2004/05/06 15:54:15 strk
- * SegmentNodeList keeps track of created splitEdges for later destruction.
- * SegmentString constructor copies given Label.
- * Buffer operation does no more leaks for doc/example.cpp
- *
- * Revision 1.2 2004/04/19 16:14:52 strk
- * Some memory leaks plugged in noding algorithms.
- *
- * Revision 1.1 2004/03/26 07:48:30 ybychkov
- * "noding" package ported (JTS 1.4)
- *
- *
- **********************************************************************/
-
More information about the geos-commits
mailing list