[geos-commits] r3634 - in branches/3.3: include/geos/geom src/geom

[svn_geos at osgeo.org]

Author: strk
Date: 2012-05-21 07:12:06 -0700 (Mon, 21 May 2012)
New Revision: 3634

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

Modified: branches/3.3/include/geos/geom/Geometry.h
===================================================================
--- branches/3.3/include/geos/geom/Geometry.h	2012-05-16 16:47:18 UTC (rev 3633)
+++ branches/3.3/include/geos/geom/Geometry.h	2012-05-21 14:12:06 UTC (rev 3634)
@@ -850,8 +850,6 @@
 	///
 	const GeometryFactory *factory;
 
-	static const GeometryFactory* INTERNAL_GEOMETRY_FACTORY;
-
 	void* userData;
 };
 

Modified: branches/3.3/src/geom/Geometry.cpp
===================================================================
--- branches/3.3/src/geom/Geometry.cpp	2012-05-16 16:47:18 UTC (rev 3633)
+++ branches/3.3/src/geom/Geometry.cpp	2012-05-21 14:12:06 UTC (rev 3634)
@@ -100,9 +100,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),
@@ -110,7 +107,7 @@
 	userData(NULL)
 {
 	if ( factory == NULL ) {
-		factory = INTERNAL_GEOMETRY_FACTORY;
+		factory = GeometryFactory::getDefaultInstance();
 	} 
 	SRID=factory->getSRID();
 }