[geos-commits] [SCM] GEOS branch master updated. f19efd2be378b158654b70202b8022d3e5df9384

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  f19efd2be378b158654b70202b8022d3e5df9384 (commit)
      from  fd0158e9c3224f415bfd2c689b6a8b685a605ebf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f19efd2be378b158654b70202b8022d3e5df9384
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Dec 18 15:24:57 2018 -0800

    Remove duplicate header includes

diff --git a/src/geom/util/Densifier.cpp b/src/geom/util/Densifier.cpp
index 9a3fb40..30f868d 100644
--- a/src/geom/util/Densifier.cpp
+++ b/src/geom/util/Densifier.cpp
@@ -27,7 +27,6 @@
 #include <geos/geom/MultiPolygon.h>
 #include <geos/geom/MultiLineString.h>
 #include <geos/geom/CoordinateSequence.h>
-#include <geos/geom/CoordinateSequenceFactory.h>
 #include <geos/geom/PrecisionModel.h>
 #include <geos/geom/Polygon.h>
 #include <geos/geom/Point.h>
diff --git a/src/geomgraph/EdgeRing.cpp b/src/geomgraph/EdgeRing.cpp
index aa60a1e..d6013d6 100644
--- a/src/geomgraph/EdgeRing.cpp
+++ b/src/geomgraph/EdgeRing.cpp
@@ -40,14 +40,6 @@
 #include <cassert>
 #include <iostream> // for operator<<
 
-#ifndef GEOS_DEBUG
-#define GEOS_DEBUG 0
-#endif
-
-#if GEOS_DEBUG
-#include <iostream>
-#endif
-
 using namespace std;
 using namespace geos::algorithm;
 using namespace geos::geom;
@@ -75,7 +67,7 @@ EdgeRing::EdgeRing(DirectedEdge *newStart,
 	 */
 	//computePoints(start);
 	//computeRing();
-#if GEOS_DEBUG
+#ifdef GEOS_DEBUG
 	cerr << "EdgeRing[" << this << "] ctor" << endl;
 #endif
 	testInvariant();
@@ -105,7 +97,7 @@ EdgeRing::~EdgeRing()
 		delete holes[i];
 	}
 
-#if GEOS_DEBUG
+#ifdef GEOS_DEBUG
 	cerr << "EdgeRing[" << this << "] dtor" << endl;
 #endif
 }
diff --git a/src/noding/snapround/SimpleSnapRounder.cpp b/src/noding/snapround/SimpleSnapRounder.cpp
index 658f32b..3098e9a 100644
--- a/src/noding/snapround/SimpleSnapRounder.cpp
+++ b/src/noding/snapround/SimpleSnapRounder.cpp
@@ -26,7 +26,6 @@
 #include <geos/geom/Coordinate.h>
 #include <geos/geom/CoordinateSequence.h>
 #include <geos/algorithm/LineIntersector.h>
-#include <geos/algorithm/LineIntersector.h>
 
 #include <vector>
 #include <exception>
diff --git a/src/operation/union/CascadedUnion.cpp b/src/operation/union/CascadedUnion.cpp
index 3b812e6..1ac984c 100644
--- a/src/operation/union/CascadedUnion.cpp
+++ b/src/operation/union/CascadedUnion.cpp
@@ -19,7 +19,6 @@
 #include <geos/operation/union/CascadedUnion.h>
 #include <geos/geom/Geometry.h>
 #include <geos/geom/GeometryFactory.h>
-#include <geos/geom/Geometry.h>
 #include <geos/geom/util/GeometryCombiner.h>
 #include <geos/index/strtree/STRtree.h>
 // std
diff --git a/src/operation/valid/ConnectedInteriorTester.cpp b/src/operation/valid/ConnectedInteriorTester.cpp
index 4205d0f..6ca5b1a 100644
--- a/src/operation/valid/ConnectedInteriorTester.cpp
+++ b/src/operation/valid/ConnectedInteriorTester.cpp
@@ -36,7 +36,6 @@
 #include <geos/geom/Location.h>
 #include <geos/geom/Polygon.h>
 #include <geos/geom/MultiPolygon.h>
-#include <geos/geom/MultiPolygon.h>
 #include <geos/geom/LineString.h>
 #include <geos/geomgraph/GeometryGraph.h>
 #include <geos/geomgraph/PlanarGraph.h>
diff --git a/src/simplify/TopologyPreservingSimplifier.cpp b/src/simplify/TopologyPreservingSimplifier.cpp
index fc7425e..b3a7022 100644
--- a/src/simplify/TopologyPreservingSimplifier.cpp
+++ b/src/simplify/TopologyPreservingSimplifier.cpp
@@ -36,14 +36,6 @@
 #include <cassert>
 #include <iostream>
 
-#ifndef GEOS_DEBUG
-#define GEOS_DEBUG 0
-#endif
-
-#ifdef GEOS_DEBUG
-#include <iostream>
-#endif
-
 using namespace geos::geom;
 
 namespace geos {
@@ -147,7 +139,7 @@ LineStringTransformer::transformCoordinates(
 		const CoordinateSequence* coords,
 		const Geometry* parent)
 {
-#if GEOS_DEBUG
+#ifdef GEOS_DEBUG
 	std::cerr << __FUNCTION__ << ": parent: " << parent
 	          << std::endl;
 #endif
@@ -157,7 +149,7 @@ LineStringTransformer::transformCoordinates(
 		assert( it != linestringMap.end() );
 
 		TaggedLineString* taggedLine = it->second;
-#if GEOS_DEBUG
+#ifdef GEOS_DEBUG
 		std::cerr << "LineStringTransformer[" << this << "] "
 		     << " getting result Coordinates from "
 		     << " TaggedLineString[" << taggedLine << "]"
@@ -307,7 +299,7 @@ TopologyPreservingSimplifier::getResultGeometry()
 		LineStringMapBuilderFilter lsmbf(linestringMap);
 		inputGeom->apply_ro(&lsmbf);
 
-#if GEOS_DEBUG
+#ifdef GEOS_DEBUG
 	std::cerr << "LineStringMapBuilderFilter applied, "
 	          << " lineStringMap contains "
 	          << linestringMap.size() << " elements\n";
@@ -318,14 +310,14 @@ TopologyPreservingSimplifier::getResultGeometry()
 		lineSimplifier->simplify(begin, end);
 
 
-#if GEOS_DEBUG
+#ifdef GEOS_DEBUG
 	std::cerr << "all TaggedLineString simplified\n";
 #endif
 
 		LineStringTransformer trans(linestringMap);
 		result = trans.transform(inputGeom);
 
-#if GEOS_DEBUG
+#ifdef GEOS_DEBUG
 	std::cerr << "inputGeom transformed\n";
 #endif
 
@@ -351,7 +343,7 @@ TopologyPreservingSimplifier::getResultGeometry()
 		delete it->second;
 	}
 
-#if GEOS_DEBUG
+#ifdef GEOS_DEBUG
 	std::cerr << "returning result\n";
 #endif
 

-----------------------------------------------------------------------

Summary of changes:
 src/geom/util/Densifier.cpp                     |  1 -
 src/geomgraph/EdgeRing.cpp                      | 12 ++----------
 src/noding/snapround/SimpleSnapRounder.cpp      |  1 -
 src/operation/union/CascadedUnion.cpp           |  1 -
 src/operation/valid/ConnectedInteriorTester.cpp |  1 -
 src/simplify/TopologyPreservingSimplifier.cpp   | 20 ++++++--------------
 6 files changed, 8 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
GEOS