[geos-commits] r3641 - in trunk: include/geos/geom src/geom

[svn_geos at osgeo.org]

Author: strk
Date: 2012-05-23 23:00:52 -0700 (Wed, 23 May 2012)
New Revision: 3641

Modified:
   trunk/include/geos/geom/Geometry.h
   trunk/src/geom/Geometry.cpp
Log:
Don't call GeometryFactory::getDefaultInstance() at startup (#540)

Modified: trunk/include/geos/geom/Geometry.h
===================================================================
--- trunk/include/geos/geom/Geometry.h	2012-05-24 00:23:42 UTC (rev 3640)
+++ trunk/include/geos/geom/Geometry.h	2012-05-24 06:00:52 UTC (rev 3641)
@@ -849,8 +849,6 @@
 	///
 	const GeometryFactory *factory;
 
-	static const GeometryFactory* INTERNAL_GEOMETRY_FACTORY;
-
 	void* userData;
 };
 

Modified: trunk/src/geom/Geometry.cpp
===================================================================
--- trunk/src/geom/Geometry.cpp	2012-05-24 00:23:42 UTC (rev 3640)
+++ trunk/src/geom/Geometry.cpp	2012-05-24 06:00:52 UTC (rev 3641)
@@ -99,9 +99,6 @@
 
 Geometry::GeometryChangedFilter Geometry::geometryChangedFilter;
 
-// REMOVE THIS, use GeometryFactory::getDefaultInstance() directly
-const GeometryFactory* Geometry::INTERNAL_GEOMETRY_FACTORY=GeometryFactory::getDefaultInstance();
-
 Geometry::Geometry(const GeometryFactory *newFactory)
 	:
 	envelope(NULL),
@@ -109,7 +106,7 @@
 	userData(NULL)
 {
 	if ( factory == NULL ) {
-		factory = INTERNAL_GEOMETRY_FACTORY;
+		factory = GeometryFactory::getDefaultInstance();
 	} 
 	SRID=factory->getSRID();
 }