[geos-commits] [SCM] GEOS branch master updated. 3d81f71d2984cc98c543a9eeccbee12be2769686

git at osgeo.org git at osgeo.org
Thu Jan 24 15:26:14 PST 2019


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  3d81f71d2984cc98c543a9eeccbee12be2769686 (commit)
      from  02ddad983f2a72bba5c25bac69d8c5f0ce01b276 (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 3d81f71d2984cc98c543a9eeccbee12be2769686
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jan 24 15:25:23 2019 -0800

    Add a return value in no-entry portion of code to quite compiler.

diff --git a/src/geom/GeometryFactory.cpp b/src/geom/GeometryFactory.cpp
index 3d88631..6640e25 100644
--- a/src/geom/GeometryFactory.cpp
+++ b/src/geom/GeometryFactory.cpp
@@ -34,6 +34,7 @@
 #include <geos/geom/Envelope.h>
 #include <geos/geom/util/CoordinateOperation.h>
 #include <geos/geom/util/GeometryEditor.h>
+#include <geos/util/GEOSException.h>
 #include <geos/util/IllegalArgumentException.h>
 
 #include <cassert>
@@ -746,7 +747,8 @@ GeometryFactory::buildGeometry(const vector<Geometry *> &fromGeoms) const
 	} else if (type == GEOS_POINT) {
 		return createMultiPoint(fromGeoms);
 	}
-	assert(0); // buildGeomtry encountered an unkwnon geometry type
+    geos::util::GEOSException("GeometryFactory::buildGeometry encountered an unknown geometry type!");
+    return fromGeoms[0]->clone();
 }
 
 /*public*/

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

Summary of changes:
 src/geom/GeometryFactory.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list