[geos-commits] r3770 - trunk/include/geos/io

[svn_geos at osgeo.org]

Author: strk
Date: 2013-02-25 03:04:23 -0800 (Mon, 25 Feb 2013)
New Revision: 3770

Modified:
   trunk/include/geos/io/WKTReader.h
   trunk/include/geos/io/WKTReader.inl
Log:
Deprecate WKTReader constructor taking GeometryFactory by pointer

Add constructor taking it by reference, for consistency with WKBReader
Closes #310

Modified: trunk/include/geos/io/WKTReader.h
===================================================================
--- trunk/include/geos/io/WKTReader.h	2013-02-25 10:37:36 UTC (rev 3769)
+++ trunk/include/geos/io/WKTReader.h	2013-02-25 11:04:23 UTC (rev 3770)
@@ -67,6 +67,9 @@
 	 * so be sure you'll keep the factory alive for the
 	 * whole WKTReader and created Geometry life.
 	 */
+	WKTReader(const geom::GeometryFactory &gf);
+
+	/** @deprecated in 3.4.0 */
 	WKTReader(const geom::GeometryFactory *gf);
 
 	/**

Modified: trunk/include/geos/io/WKTReader.inl
===================================================================
--- trunk/include/geos/io/WKTReader.inl	2013-02-25 10:37:36 UTC (rev 3769)
+++ trunk/include/geos/io/WKTReader.inl	2013-02-25 11:04:23 UTC (rev 3770)
@@ -41,6 +41,17 @@
 }
 
 INLINE
+WKTReader::WKTReader(const geom::GeometryFactory &gf)
+	:
+	geometryFactory(&gf),
+	precisionModel(gf.getPrecisionModel())
+{
+#if GEOS_DEBUG
+    std::cerr << "\nGEOS_DEBUG: WKTReader::WKTReader(const GeometryFactory &gf)\n";
+#endif
+}
+
+INLINE
 WKTReader::WKTReader()
 	:
 	geometryFactory(geom::GeometryFactory::getDefaultInstance()),