[geos-commits] [SCM] GEOS branch master updated. 9c4f95f9f38788cab222c1037972ea4cb660a923

[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  9c4f95f9f38788cab222c1037972ea4cb660a923 (commit)
      from  aefa49cbc3d096b98333332c12faff26f6fae02e (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 9c4f95f9f38788cab222c1037972ea4cb660a923
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Nov 16 14:29:16 2018 -0800

    Formatting changes to please make check (hm)

diff --git a/include/geos/operation/overlay/OverlayOp.h b/include/geos/operation/overlay/OverlayOp.h
index 0ed54cf..9352344 100644
--- a/include/geos/operation/overlay/OverlayOp.h
+++ b/include/geos/operation/overlay/OverlayOp.h
@@ -329,27 +329,27 @@ private:
 	bool isCovered(const geom::Coordinate& coord,
 			std::vector<geom::LineString*> *geomList);
 	/**
-	* For empty result, what is the correct geometry type to apply to 
+	* For empty result, what is the correct geometry type to apply to
 	* the empty?
 	*/
-	geom::Dimension::DimensionType resultDimension(OverlayOp::OpCode overlayOpCode, 
+	geom::Dimension::DimensionType resultDimension(OverlayOp::OpCode overlayOpCode,
 		const geom::Geometry *g0, const geom::Geometry *g1);
 
 	/**
 	* Creates an empty result geometry of the appropriate dimension,
 	* based on the given overlay operation and the dimensions of the inputs.
-	* The created geometry is always an atomic geometry, 
+	* The created geometry is always an atomic geometry,
 	* not a collection.
-	*  
+	*
 	* The empty result is constructed using the following rules:
-	*  
+	*
 	* * #opINTERSECTION  result has the dimension of the lowest input dimension
 	* * #opUNION - result has the dimension of the highest input dimension
 	* * #opDIFFERENCE - result has the dimension of the left-hand input
 	* * #opSYMDIFFERENCE - result has the dimension of the highest input dimension
 	*/
 	geom::Geometry* createEmptyResult(
-		OverlayOp::OpCode overlayOpCode, const geom::Geometry *a, 
+		OverlayOp::OpCode overlayOpCode, const geom::Geometry *a,
 		const geom::Geometry *b, const geom::GeometryFactory *geomFact);
 
 	/**
diff --git a/src/operation/overlay/OverlayOp.cpp b/src/operation/overlay/OverlayOp.cpp
index 11a858a..56ed803 100644
--- a/src/operation/overlay/OverlayOp.cpp
+++ b/src/operation/overlay/OverlayOp.cpp
@@ -640,25 +640,25 @@ OverlayOp::isCovered(const Coordinate& coord,vector<Polygon*> *geomList)
 }
 
 Dimension::DimensionType
-OverlayOp::resultDimension(OverlayOp::OpCode overlayOpCode, 
+OverlayOp::resultDimension(OverlayOp::OpCode overlayOpCode,
                 const Geometry *g0, const Geometry *g1)
 {
 	Dimension::DimensionType dim0 = g0->getDimension();
 	Dimension::DimensionType dim1 = g1->getDimension();
 
 	Dimension::DimensionType resultDimension = Dimension::False;
-	switch (overlayOpCode) 
+	switch (overlayOpCode)
 	{
-		case OverlayOp::opINTERSECTION: 
+		case OverlayOp::opINTERSECTION:
 			resultDimension = min(dim0, dim1);
 			break;
-		case OverlayOp::opUNION: 
+		case OverlayOp::opUNION:
 			resultDimension = max(dim0, dim1);
 			break;
-		case OverlayOp::opDIFFERENCE: 
+		case OverlayOp::opDIFFERENCE:
 			resultDimension = dim0;
 			break;
-		case OverlayOp::opSYMDIFFERENCE: 
+		case OverlayOp::opSYMDIFFERENCE:
 			resultDimension = max(dim0, dim1);
 			break;
 	}
@@ -666,12 +666,12 @@ OverlayOp::resultDimension(OverlayOp::OpCode overlayOpCode,
 }
 
 geom::Geometry*
-OverlayOp::createEmptyResult(OverlayOp::OpCode overlayOpCode, 
-                             const geom::Geometry *a, const geom::Geometry *b, 
+OverlayOp::createEmptyResult(OverlayOp::OpCode overlayOpCode,
+                             const geom::Geometry *a, const geom::Geometry *b,
                              const GeometryFactory *geomFact)
 {
 	geom::Geometry *result = nullptr;
-	switch (resultDimension(overlayOpCode, a, b)) 
+	switch (resultDimension(overlayOpCode, a, b))
 	{
 		case Dimension::P:
 			result = geomFact->createPoint();
@@ -719,7 +719,7 @@ OverlayOp::computeGeometry(vector<Point*> *nResultPointList,
 
 	if (geomList->empty())
 	{
-		return createEmptyResult(opCode, arg[0]->getGeometry(), 
+		return createEmptyResult(opCode, arg[0]->getGeometry(),
 		                         arg[1]->getGeometry(), geomFact);
 	}
 	// build the most specific geometry possible

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

Summary of changes:
 include/geos/operation/overlay/OverlayOp.h | 12 ++++++------
 src/operation/overlay/OverlayOp.cpp        | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GEOS