[geos-commits] r2577 - trunk/capi

[svn_geos at osgeo.org]

Author: strk
Date: 2009-06-15 06:13:07 -0400 (Mon, 15 Jun 2009)
New Revision: 2577

Modified:
   trunk/capi/geos_ts_c.cpp
Log:
Stop explicitly using the CLocalizer now that it is done within WKTReader and WKTWriter (see bug #260). Some deep testing about this would be good. Make check worked for me with comma-using locale.


Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp	2009-06-15 10:06:50 UTC (rev 2576)
+++ trunk/capi/geos_ts_c.cpp	2009-06-15 10:13:07 UTC (rev 2577)
@@ -35,7 +35,6 @@
 #include <geos/io/WKBReader.h>
 #include <geos/io/WKTWriter.h>
 #include <geos/io/WKBWriter.h>
-#include <geos/io/CLocalizer.h>
 #include <geos/simplify/DouglasPeuckerSimplifier.h>
 #include <geos/simplify/TopologyPreservingSimplifier.h>
 #include <geos/operation/valid/IsValidOp.h>
@@ -90,7 +89,6 @@
 using geos::io::WKTWriter;
 using geos::io::WKBReader;
 using geos::io::WKBWriter;
-using geos::io::CLocalizer;
 
 using geos::operation::overlay::OverlayOp;
 using geos::operation::overlay::overlayOp;
@@ -781,7 +779,6 @@
 
     try
     {
-        CLocalizer clocale;
         const std::string wktstring(wkt);
         WKTReader r(static_cast<GeometryFactory const*>(handle->geomFactory));
 
@@ -817,7 +814,6 @@
 
     try
     {
-        CLocalizer clocale;
 
         char *result = gstrdup(g1->toString());
         return result;
@@ -3061,7 +3057,6 @@
         return 0;
     }
 
-    CLocalizer clocale;
     try
     {
         const std::string wktstring(wkt);
@@ -3173,7 +3168,6 @@
         return NULL;
     }
 
-    CLocalizer clocale;
     try
     {
         std::string sgeom(writer->write(geom));