[geos-commits] r2557 - in trunk: source/headers/geos
source/headers/geos/algorithm source/headers/geos/algorithm/distance
source/headers/geos/algorithm/locate source/headers/geos/geom
source/headers/geos/geom/prep source/headers/geos/geom/util
source/headers/geos/geomgraph
source/headers/geos/geomgraph/index source/headers/geos/index
source/headers/geos/index/bintree source/headers/geos/index/chain
source/headers/geos/index/intervalrtree
source/headers/geos/index/quadtree source/headers/geos/index/strtree
source/headers/geos/index/sweepline source/headers/geos/io
source/headers/geos/noding source/headers/geos/noding/snapround
source/headers/geos/operation source/headers/geos/operation/buffer
source/headers/geos/operation/distance
source/headers/geos/operation/linemerge
source/headers/geos/operation/overlay
source/headers/geos/operation/overlay/snap
source/headers/geos/operation/polygonize
source/headers/geos/operation/predicate
source/headers/geos/operation/relate
source/headers/geos/operation/valid source/headers/geos/planargraph
source/headers/geos/planargraph/algorithm
source/headers/geos/precision source/headers/geos/simplify
source/headers/geos/util tests/unit
svn_geos at osgeo.org
svn_geos at osgeo.org
Mon Jun 8 05:30:55 EDT 2009
Author: strk
Date: 2009-06-08 05:30:55 -0400 (Mon, 08 Jun 2009)
New Revision: 2557
Modified:
trunk/source/headers/geos/Makefile.am
trunk/source/headers/geos/algorithm/Makefile.am
trunk/source/headers/geos/algorithm/distance/Makefile.am
trunk/source/headers/geos/algorithm/locate/Makefile.am
trunk/source/headers/geos/geom/Makefile.am
trunk/source/headers/geos/geom/prep/Makefile.am
trunk/source/headers/geos/geom/util/Makefile.am
trunk/source/headers/geos/geomgraph/Depth.h
trunk/source/headers/geos/geomgraph/DirectedEdge.h
trunk/source/headers/geos/geomgraph/DirectedEdgeStar.h
trunk/source/headers/geos/geomgraph/Edge.h
trunk/source/headers/geos/geomgraph/EdgeEnd.h
trunk/source/headers/geos/geomgraph/EdgeEndStar.h
trunk/source/headers/geos/geomgraph/EdgeIntersection.h
trunk/source/headers/geos/geomgraph/EdgeIntersectionList.h
trunk/source/headers/geos/geomgraph/EdgeList.h
trunk/source/headers/geos/geomgraph/EdgeNodingValidator.h
trunk/source/headers/geos/geomgraph/EdgeRing.h
trunk/source/headers/geos/geomgraph/GeometryGraph.h
trunk/source/headers/geos/geomgraph/GeometryGraph.inl
trunk/source/headers/geos/geomgraph/GraphComponent.h
trunk/source/headers/geos/geomgraph/Label.h
trunk/source/headers/geos/geomgraph/Makefile.am
trunk/source/headers/geos/geomgraph/Node.h
trunk/source/headers/geos/geomgraph/NodeFactory.h
trunk/source/headers/geos/geomgraph/NodeMap.h
trunk/source/headers/geos/geomgraph/PlanarGraph.h
trunk/source/headers/geos/geomgraph/Position.h
trunk/source/headers/geos/geomgraph/Quadrant.h
trunk/source/headers/geos/geomgraph/TopologyLocation.h
trunk/source/headers/geos/geomgraph/index/Makefile.am
trunk/source/headers/geos/index/Makefile.am
trunk/source/headers/geos/index/bintree/Makefile.am
trunk/source/headers/geos/index/chain/Makefile.am
trunk/source/headers/geos/index/intervalrtree/Makefile.am
trunk/source/headers/geos/index/quadtree/Makefile.am
trunk/source/headers/geos/index/strtree/Makefile.am
trunk/source/headers/geos/index/sweepline/Makefile.am
trunk/source/headers/geos/io/Makefile.am
trunk/source/headers/geos/noding/Makefile.am
trunk/source/headers/geos/noding/snapround/Makefile.am
trunk/source/headers/geos/operation/Makefile.am
trunk/source/headers/geos/operation/buffer/Makefile.am
trunk/source/headers/geos/operation/distance/ConnectedElementLocationFilter.h
trunk/source/headers/geos/operation/distance/ConnectedElementPointFilter.h
trunk/source/headers/geos/operation/distance/DistanceOp.h
trunk/source/headers/geos/operation/distance/GeometryLocation.h
trunk/source/headers/geos/operation/distance/Makefile.am
trunk/source/headers/geos/operation/linemerge/Makefile.am
trunk/source/headers/geos/operation/overlay/Makefile.am
trunk/source/headers/geos/operation/overlay/MaximalEdgeRing.h
trunk/source/headers/geos/operation/overlay/OverlayOp.h
trunk/source/headers/geos/operation/overlay/snap/Makefile.am
trunk/source/headers/geos/operation/polygonize/Makefile.am
trunk/source/headers/geos/operation/predicate/Makefile.am
trunk/source/headers/geos/operation/relate/EdgeEndBuilder.h
trunk/source/headers/geos/operation/relate/EdgeEndBundle.h
trunk/source/headers/geos/operation/relate/EdgeEndBundleStar.h
trunk/source/headers/geos/operation/relate/Makefile.am
trunk/source/headers/geos/operation/relate/RelateComputer.h
trunk/source/headers/geos/operation/relate/RelateNode.h
trunk/source/headers/geos/operation/relate/RelateNodeFactory.h
trunk/source/headers/geos/operation/relate/RelateNodeGraph.h
trunk/source/headers/geos/operation/relate/RelateOp.h
trunk/source/headers/geos/operation/valid/ConsistentAreaTester.h
trunk/source/headers/geos/operation/valid/Makefile.am
trunk/source/headers/geos/planargraph/Makefile.am
trunk/source/headers/geos/planargraph/algorithm/Makefile.am
trunk/source/headers/geos/precision/Makefile.am
trunk/source/headers/geos/simplify/Makefile.am
trunk/source/headers/geos/util/Makefile.am
trunk/tests/unit/Makefile.am
Log:
Install all C++ headers to reduce maintainance costs. C++ API is documented as being unstable after all so let's give users the power to hurt themselves :)
Modified: trunk/source/headers/geos/Makefile.am
===================================================================
--- trunk/source/headers/geos/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -18,10 +18,10 @@
geos_HEADERS = \
export.h \
- geom.h \
- geomUtil.h \
geomgraph.h \
geomgraphindex.h \
+ geom.h \
+ geomUtil.h \
geosAlgorithm.h \
indexBintree.h \
indexChain.h \
@@ -34,24 +34,21 @@
nodingSnapround.h \
opBuffer.h \
opDistance.h \
+ operation.h \
+ operation.h \
opLinemerge.h \
opOverlay.h \
opPolygonize.h \
opPredicate.h \
opRelate.h \
opValid.h \
- operation.h \
- operation.h \
planargraph.h \
+ platform.h \
precision.h \
+ profiler.h \
spatialIndex.h \
timeval.h \
unload.h \
- util.h
+ util.h \
+ version.h
-nodist_geos_HEADERS = \
- platform.h \
- version.h
-
-noinst_HEADERS = \
- profiler.h
Modified: trunk/source/headers/geos/algorithm/Makefile.am
===================================================================
--- trunk/source/headers/geos/algorithm/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/algorithm/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -4,41 +4,30 @@
EXTRA_DIST =
-# Notes:
-#
-# PointLocator.h is needed by DistanceOp.h and OverlayOp.h for composition
-# needed by RelateComputer.h needed by RelateOp.h
-#
-# LineIntersector.h needed by GeometryGraphOperation.h needed by OverlayOp.h
-# needed by RelateComputer.h needed by RelateOp.h
-#
-
geosdir = $(includedir)/geos/algorithm
geos_HEADERS = \
- LineIntersector.h \
- PointLocator.h
-
-noinst_HEADERS = \
Angle.h \
BoundaryNodeRule.h \
- CGAlgorithms.h \
CentralEndpointIntersector.h \
CentroidArea.h \
CentroidLine.h \
CentroidPoint.h \
+ CGAlgorithms.h \
ConvexHull.h \
ConvexHull.inl \
HCoordinate.h \
InteriorPointArea.h \
InteriorPointLine.h \
InteriorPointPoint.h \
+ LineIntersector.h \
MCPointInRing.h \
MinimumDiameter.h \
NotRepresentableException.h \
PointInRing.h \
+ PointLocator.h \
RayCrossingCounter.h \
RobustDeterminant.h \
- SIRtreePointInRing.h \
- SimplePointInRing.h
+ SimplePointInRing.h \
+ SIRtreePointInRing.h
Modified: trunk/source/headers/geos/algorithm/distance/Makefile.am
===================================================================
--- trunk/source/headers/geos/algorithm/distance/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/algorithm/distance/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,15 +2,9 @@
EXTRA_DIST =
-# Notes:
-#
-#
-
geosdir = $(includedir)/geos/algorithm/distance
-geos_HEADERS =
-
-noinst_HEADERS = \
+geos_HEADERS = \
DiscreteHausdorffDistance.h \
DistanceToPoint.h \
PointPairDistance.h
Modified: trunk/source/headers/geos/algorithm/locate/Makefile.am
===================================================================
--- trunk/source/headers/geos/algorithm/locate/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/algorithm/locate/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,20 +2,10 @@
EXTRA_DIST =
-# Notes:
-#
-# PointLocator.h is needed by DistanceOp.h and OverlayOp.h for composition
-# needed by RelateComputer.h needed by RelateOp.h
-#
-# LineIntersector.h needed by GeometryGraphOperation.h needed by OverlayOp.h
-# needed by RelateComputer.h needed by RelateOp.h
-#
-
geosdir = $(includedir)/geos/algorithm/locate
-geos_HEADERS =
-
-noinst_HEADERS = \
+geos_HEADERS = \
IndexedPointInAreaLocator.h \
PointOnGeometryLocator.h \
SimplePointInAreaLocator.h
+
Modified: trunk/source/headers/geos/geom/Makefile.am
===================================================================
--- trunk/source/headers/geos/geom/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geom/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -4,44 +4,37 @@
#EXTRA_DIST =
-# Notes:
-# GeometryComponentFilter.h needed by Polygonizer.h
-# LineSegment.h needed by buffer/OffsetCurveBuilder.h needed by BufferOp.h,
-# needed by index/chain/monotoneChainSelectAction.h by McPointInRing.h,
-# needed by index/chain/monotoneChainOverlapAction.h by McIndexNoder.h
-# Location.h needed by PointLocator.h for inlines
-
geosdir = $(includedir)/geos/geom
geos_HEADERS = \
BinaryOp.h \
- Coordinate.h \
- Coordinate.inl \
- CoordinateArraySequence.h \
CoordinateArraySequenceFactory.h \
CoordinateArraySequenceFactory.inl \
+ CoordinateArraySequence.h \
CoordinateFilter.h \
+ Coordinate.h \
+ Coordinate.inl \
CoordinateList.h \
- CoordinateSequence.h \
CoordinateSequenceFactory.h \
CoordinateSequenceFilter.h \
+ CoordinateSequence.h \
Dimension.h \
Envelope.h \
Envelope.inl \
- Geometry.h \
- Geometry.inl \
- GeometryList.h \
GeometryCollection.h \
GeometryCollection.inl \
GeometryComponentFilter.h \
GeometryFactory.h \
GeometryFactory.inl \
GeometryFilter.h \
+ Geometry.h \
+ Geometry.inl \
+ GeometryList.h \
IntersectionMatrix.h \
+ LinearRing.h \
LineSegment.h \
LineSegment.inl \
LineString.h \
- LinearRing.h \
Location.h \
MultiLineString.h \
MultiLineString.inl \
@@ -51,7 +44,5 @@
Point.h \
Polygon.h \
PrecisionModel.h \
- PrecisionModel.inl
-
-noinst_HEADERS = \
- Triangle.h
+ PrecisionModel.inl \
+ Triangle.h
Modified: trunk/source/headers/geos/geom/prep/Makefile.am
===================================================================
--- trunk/source/headers/geos/geom/prep/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geom/prep/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -19,4 +19,3 @@
PreparedPolygonIntersects.h \
PreparedPolygonPredicate.h
-#noinst_HEADERS =
Modified: trunk/source/headers/geos/geom/util/Makefile.am
===================================================================
--- trunk/source/headers/geos/geom/util/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geom/util/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,4 +16,3 @@
PolygonExtracter.h \
ShortCircuitedGeometryVisitor.h
-#noinst_HEADERS =
Modified: trunk/source/headers/geos/geomgraph/Depth.h
===================================================================
--- trunk/source/headers/geos/geomgraph/Depth.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/Depth.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/Depth.java rev. 1.4 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/DirectedEdge.h
===================================================================
--- trunk/source/headers/geos/geomgraph/DirectedEdge.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/DirectedEdge.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/DirectedEdge.java rev. 1.5 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/DirectedEdgeStar.h
===================================================================
--- trunk/source/headers/geos/geomgraph/DirectedEdgeStar.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/DirectedEdgeStar.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/DirectedEdgeStar.java rev. 1.4 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/Edge.h
===================================================================
--- trunk/source/headers/geos/geomgraph/Edge.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/Edge.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/Edge.java rev. 1.4 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/EdgeEnd.h
===================================================================
--- trunk/source/headers/geos/geomgraph/EdgeEnd.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/EdgeEnd.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/EdgeEnd.java rev. 1.6 (JTS-1.10)
*
- * EXPOSED GEOS HEADER, but direct use NOT reccommended
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/EdgeEndStar.h
===================================================================
--- trunk/source/headers/geos/geomgraph/EdgeEndStar.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/EdgeEndStar.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/EdgeEndStar.java rev. 1.8 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/EdgeIntersection.h
===================================================================
--- trunk/source/headers/geos/geomgraph/EdgeIntersection.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/EdgeIntersection.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -17,8 +17,6 @@
*
* Last port: geomgraph/EdgeIntersection.java rev. 1.5 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/EdgeIntersectionList.h
===================================================================
--- trunk/source/headers/geos/geomgraph/EdgeIntersectionList.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/EdgeIntersectionList.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/EdgeIntersectionList.java rev. 1.5 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/EdgeList.h
===================================================================
--- trunk/source/headers/geos/geomgraph/EdgeList.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/EdgeList.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/EdgeList.java rev. 1.4 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/EdgeNodingValidator.h
===================================================================
--- trunk/source/headers/geos/geomgraph/EdgeNodingValidator.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/EdgeNodingValidator.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/EdgeNodingValidator.java rev. 1.6 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/EdgeRing.h
===================================================================
--- trunk/source/headers/geos/geomgraph/EdgeRing.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/EdgeRing.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/EdgeRing.java rev. 1.10 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/GeometryGraph.h
===================================================================
--- trunk/source/headers/geos/geomgraph/GeometryGraph.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/GeometryGraph.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/GeometryGraph.java rev. 1.9 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/GeometryGraph.inl
===================================================================
--- trunk/source/headers/geos/geomgraph/GeometryGraph.inl 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/GeometryGraph.inl 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: geomgraph/GeometryGraph.java rev. 1.9 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_GEOMGRAPH_GEOMETRYGRAPH_INL
Modified: trunk/source/headers/geos/geomgraph/GraphComponent.h
===================================================================
--- trunk/source/headers/geos/geomgraph/GraphComponent.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/GraphComponent.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/GraphComponent.java rev. 1.3 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/Label.h
===================================================================
--- trunk/source/headers/geos/geomgraph/Label.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/Label.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/Label.java rev. 1.8 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/Makefile.am
===================================================================
--- trunk/source/headers/geos/geomgraph/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,61 +2,30 @@
#EXTRA_DIST =
-# NOTES:
-#
-# EdgeList.h is needed by OverlayOp.h for composition
-#
-# PlanarGraph.h is needed by OverlayOp.h for inlines
-#
-# Depth.h needed by Edge.h
-#
-# EdgeRing.h needed by operation/overlay/{Minimal,Maximal}EdgeRing.h
-# for inheritance, but they are NOT installed
-#
-# Node.h needed by NodeMap.h for invariant testing
-#
-# NodeMap.h needed by RelateComputer.h needed by RelateOp.h
-# also needed by PlanarGraph.h for typedefs
-#
-# NodeFactory.h needed by operation/overlay/OverlayNodeFactory.h
-# and operation/relate/RelateNodeFactory.h for inheritance.
-# Both NOT installed
-#
-# GraphComponent.h needed by Node.h and Edge.h for inheritance
-#
-# EdgeEnd.h needed by Node.h for invariant tester
-#
-# EdgeEndStar.h needed by Node.h for invariant tester
-#
-# Depth.h needed by Edge.h for composition, which is NOT installed
-#
-#
-
geosdir = $(includedir)/geos/geomgraph
geos_HEADERS = \
- EdgeEnd.h \
- EdgeEndStar.h \
- EdgeList.h \
- GeometryGraph.h \
- GeometryGraph.inl \
- GraphComponent.h \
- Node.h \
- NodeMap.h \
- PlanarGraph.h
-
-noinst_HEADERS = \
Depth.h \
DirectedEdge.h \
DirectedEdge.inl \
DirectedEdgeStar.h \
+ EdgeEnd.h \
+ EdgeEndStar.h \
Edge.h \
EdgeIntersection.h \
EdgeIntersectionList.h \
+ EdgeList.h \
EdgeNodingValidator.h \
EdgeRing.h \
+ GeometryGraph.h \
+ GeometryGraph.inl \
+ GraphComponent.h \
Label.h \
NodeFactory.h \
+ Node.h \
+ NodeMap.h \
+ PlanarGraph.h \
Position.h \
Quadrant.h \
- TopologyLocation.h
+ TopologyLocation.h
+
Modified: trunk/source/headers/geos/geomgraph/Node.h
===================================================================
--- trunk/source/headers/geos/geomgraph/Node.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/Node.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/Node.java rev. 1.7 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/NodeFactory.h
===================================================================
--- trunk/source/headers/geos/geomgraph/NodeFactory.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/NodeFactory.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/NodeFactory.java rev. 1.3 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/NodeMap.h
===================================================================
--- trunk/source/headers/geos/geomgraph/NodeMap.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/NodeMap.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/NodeMap.java rev. 1.3 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/PlanarGraph.h
===================================================================
--- trunk/source/headers/geos/geomgraph/PlanarGraph.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/PlanarGraph.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/PlanarGraph.java rev. 1.6 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/Position.h
===================================================================
--- trunk/source/headers/geos/geomgraph/Position.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/Position.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/Position.java rev. 1.4 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/Quadrant.h
===================================================================
--- trunk/source/headers/geos/geomgraph/Quadrant.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/Quadrant.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/Quadrant.java rev. 1.8 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/TopologyLocation.h
===================================================================
--- trunk/source/headers/geos/geomgraph/TopologyLocation.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/TopologyLocation.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: geomgraph/TopologyLocation.java rev. 1.6 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
Modified: trunk/source/headers/geos/geomgraph/index/Makefile.am
===================================================================
--- trunk/source/headers/geos/geomgraph/index/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/geomgraph/index/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -17,4 +17,3 @@
SweepLineEventObj.h \
SweepLineSegment.h
-#noinst_HEADERS =
Modified: trunk/source/headers/geos/index/Makefile.am
===================================================================
--- trunk/source/headers/geos/index/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/index/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -14,4 +14,3 @@
ItemVisitor.h \
SpatialIndex.h
-noinst_HEADERS =
Modified: trunk/source/headers/geos/index/bintree/Makefile.am
===================================================================
--- trunk/source/headers/geos/index/bintree/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/index/bintree/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -3,18 +3,13 @@
EXTRA_DIST =
-# NOTES:
-#
-# Interval.h is needed by algorithm/MCPointInRing.h for composition
-
geosdir = $(includedir)/geos/index/bintree
geos_HEADERS = \
Bintree.h \
- Interval.h
-
-noinst_HEADERS = \
+ Interval.h \
Key.h \
NodeBase.h \
Node.h \
- Root.h
+ Root.h
+
Modified: trunk/source/headers/geos/index/chain/Makefile.am
===================================================================
--- trunk/source/headers/geos/index/chain/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/index/chain/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,20 +2,11 @@
EXTRA_DIST =
-# NOTES:
-#
-# MonotoneChainSelectAction.h needed by algorithm/MCPointInRing.h
-# for inheritance
-# MonotoneChainOverlapAction.h needed by algorithm/MCIndexNoder.h
-# for inheritance
-#
-
geosdir = $(includedir)/geos/index/chain
geos_HEADERS = \
- MonotoneChain.h \
+ MonotoneChain.h \
+ MonotoneChainBuilder.h \
MonotoneChainOverlapAction.h \
MonotoneChainSelectAction.h
-noinst_HEADERS = \
- MonotoneChainBuilder.h
Modified: trunk/source/headers/geos/index/intervalrtree/Makefile.am
===================================================================
--- trunk/source/headers/geos/index/intervalrtree/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/index/intervalrtree/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -4,10 +4,9 @@
geosdir = $(includedir)/geos/index/intervalrtree
-geos_HEADERS =
-
-noinst_HEADERS = \
+geos_HEADERS = \
IntervalRTreeBranchNode.h \
IntervalRTreeLeafNode.h \
IntervalRTreeNode.h \
SortedPackedIntervalRTree.h
+
Modified: trunk/source/headers/geos/index/quadtree/Makefile.am
===================================================================
--- trunk/source/headers/geos/index/quadtree/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/index/quadtree/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,19 +2,14 @@
EXTRA_DIST =
-# NOTES:
-# Root.h is needed by Quadtree.h for inlines
-# NodeBase.h is needed by Root.h for inheritance
-
geosdir = $(includedir)/geos/index/quadtree
geos_HEADERS = \
+ DoubleBits.h \
+ IntervalSize.h \
+ Key.h \
NodeBase.h \
+ Node.h \
Quadtree.h \
- Root.h
+ Root.h
-noinst_HEADERS = \
- DoubleBits.h \
- IntervalSize.h \
- Key.h \
- Node.h
Modified: trunk/source/headers/geos/index/strtree/Makefile.am
===================================================================
--- trunk/source/headers/geos/index/strtree/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/index/strtree/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,23 +2,14 @@
EXTRA_DIST =
-# NOTES:
-#
-# AbstractSTRtree.h needed by STRtree.h for inheritance
-# AbstractSTRtree.h needed by SIRtree.h for inheritance
-# Interval.h needed by SIRtree.h for inlines
-# Boundable.h needed by ItemBoundable.h and AbstractNode.h for inheritance
-# AbstractNode.h needed by AbstractSTRtree.h for inlines
-
geosdir = $(includedir)/geos/index/strtree
geos_HEADERS = \
- AbstractNode.h \
+ AbstractNode.h \
AbstractSTRtree.h \
- Boundable.h \
- Interval.h \
- SIRtree.h \
- STRtree.h
+ Boundable.h \
+ Interval.h \
+ ItemBoundable.h \
+ SIRtree.h \
+ STRtree.h
-noinst_HEADERS = \
- ItemBoundable.h
Modified: trunk/source/headers/geos/index/sweepline/Makefile.am
===================================================================
--- trunk/source/headers/geos/index/sweepline/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/index/sweepline/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,17 +2,11 @@
EXTRA_DIST =
-# NOTES:
-#
-# SweepLineOverlapAction.h needed by operation/valid/SweeplineNestedRingTester.h
-# for inheritance (but that header is not installed)
-
geosdir = $(includedir)/geos/index/sweepline
geos_HEADERS = \
- SweepLineOverlapAction.h
-
-noinst_HEADERS = \
SweepLineEvent.h \
SweepLineIndex.h \
- SweepLineInterval.h
+ SweepLineInterval.h \
+ SweepLineOverlapAction.h
+
Modified: trunk/source/headers/geos/io/Makefile.am
===================================================================
--- trunk/source/headers/geos/io/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/io/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,12 +2,6 @@
EXTRA_DIST =
-# NOTES:
-# ByteOrderDataInStream.{h,inl} needed by WKBReader.h for composition
-# ByteOrderValues.h needed by ByteOrderDataInStream.inl for inlines
-# ParseException.h needed by ByteOrderDataInStream.inl for inlines
-# WKBConstants.h is worth exposing
-
geosdir = $(includedir)/geos/io
geos_HEADERS = \
@@ -16,13 +10,12 @@
ByteOrderValues.h \
CLocalizer.h \
ParseException.h \
+ StringTokenizer.h \
WKBConstants.h \
WKBReader.h \
WKBWriter.h \
WKTReader.h \
WKTReader.inl \
- WKTWriter.h
+ WKTWriter.h \
+ Writer.h
-noinst_HEADERS = \
- StringTokenizer.h \
- Writer.h
Modified: trunk/source/headers/geos/noding/Makefile.am
===================================================================
--- trunk/source/headers/geos/noding/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/noding/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -1,11 +1,10 @@
SUBDIRS = snapround
-EXTRA_DIST = MCIndexNoder.inl SegmentString.inl
+EXTRA_DIST =
-# NOTES:
-#
+geosdir = $(includedir)/geos/noding
-noinst_HEADERS = \
+geos_HEADERS = \
BasicSegmentString.h \
FastNodingValidator.h \
FastSegmentSetIntersectionFinder.h \
@@ -13,6 +12,7 @@
IntersectionFinderAdder.h \
IteratedNoder.h \
MCIndexNoder.h \
+ MCIndexNoder.inl \
MCIndexSegmentSetMutualIntersector.h \
NodableSegmentString.h \
NodedSegmentString.h \
@@ -27,11 +27,8 @@
SegmentNodeList.h \
SegmentSetMutualIntersector.h \
SegmentString.h \
+ SegmentString.inl \
SegmentStringUtil.h \
SimpleNoder.h \
SingleInteriorIntersectionFinder.h \
- SinglePassNoder.h
-
-#geosdir = $(includedir)/geos/noding
-
-#geos_HEADERS =
+ SinglePassNoder.h
Modified: trunk/source/headers/geos/noding/snapround/Makefile.am
===================================================================
--- trunk/source/headers/geos/noding/snapround/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/noding/snapround/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,11 +2,9 @@
#EXTRA_DIST =
-#geosdir = $(includedir)/geos/noding/snapround
+geosdir = $(includedir)/geos/noding/snapround
-#geos_HEADERS =
-
-noinst_HEADERS = \
+geos_HEADERS = \
HotPixel.h \
HotPixel.inl \
MCIndexPointSnapper.h \
Modified: trunk/source/headers/geos/operation/Makefile.am
===================================================================
--- trunk/source/headers/geos/operation/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -11,13 +11,9 @@
#EXTRA_DIST =
-# Notes:
-# GeometryGraphOperation.h needed by OverlayOp.h and RelateOp.h
-
geosdir = $(includedir)/geos/operation
geos_HEADERS = \
GeometryGraphOperation.h \
IsSimpleOp.h
-#noinst_HEADERS =
Modified: trunk/source/headers/geos/operation/buffer/Makefile.am
===================================================================
--- trunk/source/headers/geos/operation/buffer/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/buffer/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,19 +2,15 @@
#EXTRA_DIST =
-# NOTES:
-# OffsetCurveBuilder.h needed bu BufferOp.h for enum values
-
geosdir = $(includedir)/geos/operation/buffer
geos_HEADERS = \
- BufferOp.h \
- OffsetCurveBuilder.h
-
-noinst_HEADERS = \
- BufferBuilder.h \
+ BufferBuilder.h \
+ BufferOp.h \
BufferParameters.h \
BufferSubgraph.h \
+ OffsetCurveBuilder.h \
OffsetCurveSetBuilder.h \
- RightmostEdgeFinder.h \
- SubgraphDepthLocater.h
+ RightmostEdgeFinder.h \
+ SubgraphDepthLocater.h
+
Modified: trunk/source/headers/geos/operation/distance/ConnectedElementLocationFilter.h
===================================================================
--- trunk/source/headers/geos/operation/distance/ConnectedElementLocationFilter.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/distance/ConnectedElementLocationFilter.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/distance/ConnectedElementLocationFilter.java rev. 1.4 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_DISTANCE_CONNECTEDELEMENTLOCATIONFILTER_H
Modified: trunk/source/headers/geos/operation/distance/ConnectedElementPointFilter.h
===================================================================
--- trunk/source/headers/geos/operation/distance/ConnectedElementPointFilter.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/distance/ConnectedElementPointFilter.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/distance/ConnectedElementPointFilter.java rev. 1.7 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_DISTANCE_CONNECTEDELEMENTPOINTFILTER_H
Modified: trunk/source/headers/geos/operation/distance/DistanceOp.h
===================================================================
--- trunk/source/headers/geos/operation/distance/DistanceOp.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/distance/DistanceOp.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/distance/DistanceOp.java rev 1.17
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_DISTANCE_DISTANCEOP_H
Modified: trunk/source/headers/geos/operation/distance/GeometryLocation.h
===================================================================
--- trunk/source/headers/geos/operation/distance/GeometryLocation.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/distance/GeometryLocation.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/distance/GeometryLocation.java rev. 1.4 (JTS-1.7)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_DISTANCE_GEOMETRYLOCATION_H
Modified: trunk/source/headers/geos/operation/distance/Makefile.am
===================================================================
--- trunk/source/headers/geos/operation/distance/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/distance/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,14 +2,11 @@
#EXTRA_DIST =
-# NOTES:
-
geosdir = $(includedir)/geos/operation/distance
geos_HEADERS = \
- DistanceOp.h
-
-noinst_HEADERS = \
ConnectedElementLocationFilter.h \
ConnectedElementPointFilter.h \
- GeometryLocation.h
+ DistanceOp.h \
+ GeometryLocation.h
+
Modified: trunk/source/headers/geos/operation/linemerge/Makefile.am
===================================================================
--- trunk/source/headers/geos/operation/linemerge/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/linemerge/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,16 +2,13 @@
#EXTRA_DIST =
-# Notes: LineMergeGraph is required by LineMerger.h for composition
-
geosdir = $(includedir)/geos/operation/linemerge
geos_HEADERS = \
- LineMerger.h \
- LineMergeGraph.h
-
-noinst_HEADERS = \
- EdgeString.h \
+ EdgeString.h \
LineMergeDirectedEdge.h \
- LineMergeEdge.h \
- LineSequencer.h
+ LineMergeEdge.h \
+ LineMergeGraph.h \
+ LineMerger.h \
+ LineSequencer.h
+
Modified: trunk/source/headers/geos/operation/overlay/Makefile.am
===================================================================
--- trunk/source/headers/geos/operation/overlay/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/overlay/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,16 +2,9 @@
#EXTRA_DIST =
-# Notes:
-# snap/GeometrySnapper.h is needed by geom/BinaryOp.h
-#
-
geosdir = $(includedir)/geos/operation/overlay
geos_HEADERS = \
- OverlayOp.h
-
-noinst_HEADERS = \
EdgeSetNoder.h \
ElevationMatrixCell.h \
ElevationMatrix.h \
@@ -20,8 +13,10 @@
MinimalEdgeRing.h \
MinimalEdgeRing.inl \
OverlayNodeFactory.h \
+ OverlayOp.h \
PointBuilder.h \
PolygonBuilder.h \
validate/FuzzyPointLocator.h \
validate/OffsetPointGenerator.h \
validate/OverlayResultValidator.h
+
Modified: trunk/source/headers/geos/operation/overlay/MaximalEdgeRing.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/MaximalEdgeRing.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/overlay/MaximalEdgeRing.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/overlay/MaximalEdgeRing.java rev. 1.15 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_OVERLAY_MAXIMALEDGERING_H
Modified: trunk/source/headers/geos/operation/overlay/OverlayOp.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/OverlayOp.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/overlay/OverlayOp.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/overlay/OverlayOp.java rev. 1.31 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_OVERLAY_OVERLAYOP_H
Modified: trunk/source/headers/geos/operation/overlay/snap/Makefile.am
===================================================================
--- trunk/source/headers/geos/operation/overlay/snap/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/overlay/snap/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,16 +2,11 @@
#EXTRA_DIST =
-# Notes:
-# snap/GeometrySnapper.h is needed by geom/BinaryOp.h
-#
-
geosdir = $(includedir)/geos/operation/overlay/snap
geos_HEADERS = \
- GeometrySnapper.h
-
-noinst_HEADERS = \
+ GeometrySnapper.h \
LineStringSnapper.h \
- SnapOverlayOp.h \
- SnapIfNeededOverlayOp.h
+ SnapIfNeededOverlayOp.h \
+ SnapOverlayOp.h
+
Modified: trunk/source/headers/geos/operation/polygonize/Makefile.am
===================================================================
--- trunk/source/headers/geos/operation/polygonize/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/polygonize/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,16 +2,12 @@
#EXTRA_DIST =
-# Notes:
-#
-
geosdir = $(includedir)/geos/operation/polygonize
geos_HEADERS = \
- Polygonizer.h
-
-noinst_HEADERS = \
EdgeRing.h \
PolygonizeDirectedEdge.h \
PolygonizeEdge.h \
- PolygonizeGraph.h
+ PolygonizeGraph.h \
+ Polygonizer.h
+
Modified: trunk/source/headers/geos/operation/predicate/Makefile.am
===================================================================
--- trunk/source/headers/geos/operation/predicate/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/predicate/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,13 +2,10 @@
#EXTRA_DIST =
-# NOTES:
-# We're not exposing *any* of this package interfaces
+geosdir = $(includedir)/geos/operation/predicate
-#geosdir = $(includedir)/geos/operation/predicate
-#geos_HEADERS =
-
-noinst_HEADERS = \
+geos_HEADERS = \
RectangleContains.h \
RectangleIntersects.h \
SegmentIntersectionTester.h
+
Modified: trunk/source/headers/geos/operation/relate/EdgeEndBuilder.h
===================================================================
--- trunk/source/headers/geos/operation/relate/EdgeEndBuilder.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/relate/EdgeEndBuilder.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/relate/EdgeEndBuilder.java rev. 1.12 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_RELATE_EDGEENDBUILDER_H
Modified: trunk/source/headers/geos/operation/relate/EdgeEndBundle.h
===================================================================
--- trunk/source/headers/geos/operation/relate/EdgeEndBundle.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/relate/EdgeEndBundle.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/relate/EdgeEndBundle.java rev. 1.17 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_RELATE_EDGEENDBUNDLE_H
Modified: trunk/source/headers/geos/operation/relate/EdgeEndBundleStar.h
===================================================================
--- trunk/source/headers/geos/operation/relate/EdgeEndBundleStar.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/relate/EdgeEndBundleStar.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/relate/EdgeEndBundleStar.java rev. 1.13 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_RELATE_EDGEENDBUNDLESTAR_H
Modified: trunk/source/headers/geos/operation/relate/Makefile.am
===================================================================
--- trunk/source/headers/geos/operation/relate/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/relate/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,19 +2,15 @@
#EXTRA_DIST =
-# Notes:
-# RelateComputer.h needed by RelateOp.h
-
geosdir = $(includedir)/geos/operation/relate
geos_HEADERS = \
- RelateComputer.h \
- RelateOp.h
-
-noinst_HEADERS = \
EdgeEndBuilder.h \
EdgeEndBundle.h \
EdgeEndBundleStar.h \
- RelateNode.h \
+ RelateComputer.h \
RelateNodeFactory.h \
- RelateNodeGraph.h
+ RelateNodeGraph.h \
+ RelateNode.h \
+ RelateOp.h
+
Modified: trunk/source/headers/geos/operation/relate/RelateComputer.h
===================================================================
--- trunk/source/headers/geos/operation/relate/RelateComputer.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/relate/RelateComputer.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/relate/RelateComputer.java rev. 1.24 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_RELATE_RELATECOMPUTER_H
Modified: trunk/source/headers/geos/operation/relate/RelateNode.h
===================================================================
--- trunk/source/headers/geos/operation/relate/RelateNode.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/relate/RelateNode.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/relate/RelateNode.java rev. 1.11 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_RELATE_RELATENODE_H
Modified: trunk/source/headers/geos/operation/relate/RelateNodeFactory.h
===================================================================
--- trunk/source/headers/geos/operation/relate/RelateNodeFactory.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/relate/RelateNodeFactory.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/relate/RelateNodeFactory.java rev. 1.11 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_RELATE_RELATENODEFACTORY_H
Modified: trunk/source/headers/geos/operation/relate/RelateNodeGraph.h
===================================================================
--- trunk/source/headers/geos/operation/relate/RelateNodeGraph.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/relate/RelateNodeGraph.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/relate/RelateNodeGraph.java rev. 1.11 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_RELATE_RELATENODEGRAPH_H
Modified: trunk/source/headers/geos/operation/relate/RelateOp.h
===================================================================
--- trunk/source/headers/geos/operation/relate/RelateOp.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/relate/RelateOp.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -15,8 +15,6 @@
*
* Last port: operation/relate/RelateOp.java rev. 1.19 (JTS-1.10)
*
- * EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_RELATE_RELATEOP_H
Modified: trunk/source/headers/geos/operation/valid/ConsistentAreaTester.h
===================================================================
--- trunk/source/headers/geos/operation/valid/ConsistentAreaTester.h 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/valid/ConsistentAreaTester.h 2009-06-08 09:30:55 UTC (rev 2557)
@@ -16,8 +16,6 @@
*
* Last port: operation/valid/ConsistentAreaTester.java rev. 1.14 (JTS-1.10)
*
- * NON-EXPOSED GEOS HEADER
- *
**********************************************************************/
#ifndef GEOS_OP_CONSISTENTAREATESTER_H
Modified: trunk/source/headers/geos/operation/valid/Makefile.am
===================================================================
--- trunk/source/headers/geos/operation/valid/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/operation/valid/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,20 +2,15 @@
#EXTRA_DIST =
-# NOTES:
-# TopologyValidationError.h needed by IsValidOp.h for inlines
-# + possibly useful to export
-
geosdir = $(includedir)/geos/operation/valid
geos_HEADERS = \
- IsValidOp.h \
- TopologyValidationError.h
-
-noinst_HEADERS = \
ConnectedInteriorTester.h \
ConsistentAreaTester.h \
+ IsValidOp.h \
QuadtreeNestedRingTester.h \
RepeatedPointTester.h \
SimpleNestedRingTester.h \
- SweeplineNestedRingTester.h
+ SweeplineNestedRingTester.h \
+ TopologyValidationError.h
+
Modified: trunk/source/headers/geos/planargraph/Makefile.am
===================================================================
--- trunk/source/headers/geos/planargraph/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/planargraph/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,38 +2,14 @@
#EXTRA_DIST =
-# Notes:
-#
-# PlanarGraph.h is needed by LineMergeGraph.h (needed by LineMerger.h)
-# for inheritance
-#
-# NodeMap.h needed by PlanarGraph.h for composition
-#
-# Edge.h needed by linemerge/LineMergeEdge.h [not installed]
-# and polygonize/PolygonizeEdge.h [not installed]
-# for inheritance
-#
-# DirectedEdge.h needed by linemerge/LineMergeDirectedEdge.h [not installed]
-# and polygonize/PolygonizeDirectedEdge.h [not installed]
-# for inheritance
-#
-# DirectedEdgeStar.h needed by Node.h [not installed] for inlines
-#
-# GraphComponent.h needed by Node.h [not installed], Edge.h [not installed]
-# and DirectedEdge.h [not installed] for inheritance
-#
-#
-
geosdir = $(includedir)/geos/planargraph
geos_HEADERS = \
- NodeMap.h \
- PlanarGraph.h
-
-noinst_HEADERS = \
DirectedEdge.h \
DirectedEdgeStar.h \
Edge.h \
GraphComponent.h \
Node.h \
- Subgraph.h
+ NodeMap.h \
+ PlanarGraph.h \
+ Subgraph.h
Modified: trunk/source/headers/geos/planargraph/algorithm/Makefile.am
===================================================================
--- trunk/source/headers/geos/planargraph/algorithm/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/planargraph/algorithm/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,8 +2,6 @@
#EXTRA_DIST =
-#geosdir = $(includedir)/geos/planargraph/algorithm
-#geos_HEADERS =
-
-noinst_HEADERS = \
+geosdir = $(includedir)/geos/planargraph/algorithm
+geos_HEADERS = \
ConnectedSubgraphFinder.h
Modified: trunk/source/headers/geos/precision/Makefile.am
===================================================================
--- trunk/source/headers/geos/precision/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/precision/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,19 +2,12 @@
#EXTRA_DIST =
-# NOTES:
-# CommonBitsOp.h is worth keeping for now
-# EnhancedPrecisionOp.h is worth keeping for now
-# CommonBitsRemover.h needed by geom/BinaryOp.h
-# SimpleGeometryPrecisionReducer.h needed by geom/BinaryOp.h
-
geosdir = $(includedir)/geos/precision
geos_HEADERS = \
+ CommonBits.h \
CommonBitsOp.h \
CommonBitsRemover.h \
EnhancedPrecisionOp.h \
SimpleGeometryPrecisionReducer.h
-noinst_HEADERS = \
- CommonBits.h
Modified: trunk/source/headers/geos/simplify/Makefile.am
===================================================================
--- trunk/source/headers/geos/simplify/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/simplify/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -5,13 +5,12 @@
EXTRA_DIST =
geos_HEADERS = \
- DouglasPeuckerSimplifier.h \
- TopologyPreservingSimplifier.h
-
-noinst_HEADERS = \
DouglasPeuckerLineSimplifier.h \
+ DouglasPeuckerSimplifier.h \
LineSegmentIndex.h \
TaggedLineSegment.h \
+ TaggedLinesSimplifier.h \
TaggedLineString.h \
TaggedLineStringSimplifier.h \
- TaggedLinesSimplifier.h
+ TopologyPreservingSimplifier.h
+
Modified: trunk/source/headers/geos/util/Makefile.am
===================================================================
--- trunk/source/headers/geos/util/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/source/headers/geos/util/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -2,23 +2,17 @@
#EXTRA_DIST =
-# Notes:
-#
-# TopologyException.h needed by BinaryOp.h
-# We keep IllegalArgumentException.h as a facility (see doc/example.cpp)
-
geosdir = $(includedir)/geos/util
geos_HEADERS = \
- GEOSException.h \
- GeometricShapeFactory.h \
- IllegalArgumentException.h \
- TopologyException.h
-
-noinst_HEADERS = \
Assert.h \
AssertionFailedException.h \
CoordinateArrayFilter.h \
+ GeometricShapeFactory.h \
+ GEOSException.h \
+ IllegalArgumentException.h \
+ math.h \
+ TopologyException.h \
UniqueCoordinateArrayFilter.h \
- UnsupportedOperationException.h \
- math.h
+ UnsupportedOperationException.h
+
Modified: trunk/tests/unit/Makefile.am
===================================================================
--- trunk/tests/unit/Makefile.am 2009-06-06 22:22:28 UTC (rev 2556)
+++ trunk/tests/unit/Makefile.am 2009-06-08 09:30:55 UTC (rev 2557)
@@ -8,14 +8,14 @@
capi/test.expected \
capi/test.wkt \
capi/testrunner.sh \
- tut/tut_assert.hpp \
- tut/tut_exception.hpp \
- tut/tut.hpp \
- tut/tut_posix.hpp \
- tut/tut_reporter.hpp \
- tut/tut_restartable.hpp \
- tut/tut_result.hpp \
- tut/tut_runner.hpp
+ tut/tut_assert.hpp \
+ tut/tut_exception.hpp \
+ tut/tut.hpp \
+ tut/tut_posix.hpp \
+ tut/tut_reporter.hpp \
+ tut/tut_restartable.hpp \
+ tut/tut_result.hpp \
+ tut/tut_runner.hpp
#noinst_PROGRAMS = geos_unit
More information about the geos-commits
mailing list