Fix build with debugging on, fix bug when run against invalid linestrings

git-svn-id: http://svn.osgeo.org/postgis/trunk@5358 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/postgis/lwgeom_geos_clean.c b/postgis/lwgeom_geos_clean.c
index cc316906be763576bee0e4ce8d3a185da38d15bf..46fdc3599ceb1b8be11110dff21de2945ed83047 100644 (file)
--- a/postgis/lwgeom_geos_clean.c
+++ b/postgis/lwgeom_geos_clean.c
@@ -41,10 +41,7 @@
 #include <string.h>
 #include <assert.h>
 
-#if POSTGIS_GEOS_VERSION >= 32
-#endif
-
-/* #define POSTGIS_DEBUG_LEVEL 0 */
+/* #define POSTGIS_DEBUG_LEVEL 4 */
 
 
 #define BUFSIZE 256
@@ -736,14 +733,13 @@ lwgeom_make_valid(LWGEOM* lwgeom_in)
        POSTGIS_DEBUGF(3,
                       "Geometry [%s] is still not valid: %s. "
                       "Will try to clean up further.",
-                      lwgeom_to_ewkt(GEOS2LWGEOM(lwgeom_out, 0),
+                      lwgeom_to_ewkt(GEOS2LWGEOM(geosgeom, 0),
                        PARSER_CHECK_NONE), loggederror);
 
 
        geosout = LWGEOM_GEOS_makeValid(geosgeom);
        GEOSGeom_destroy(geosgeom);
        if ( ! geosout ) {
-               GEOSGeom_destroy(geosgeom);
                return NULL;
        }