Adapt the rest of the code to the change in LWGEOM2GEOS function

Fixes #2948 (introduced by previous commit)

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

diff --git a/liblwgeom/lwgeom_geos_node.c b/liblwgeom/lwgeom_geos_node.c
index 0773af99ef8496446e1146159f2f6e9fde72ab0e..61a089497560c9c39769959bb9bd8698ccaf1901 100644 (file)
--- a/liblwgeom/lwgeom_geos_node.c
+++ b/liblwgeom/lwgeom_geos_node.c
@@ -95,7 +95,7 @@ lwgeom_extract_unique_endpoints(const LWGEOM* lwg)
        LWGEOM* ret;
        GEOSGeometry *gepu;
        LWMPOINT *epall = lwgeom_extract_endpoints(lwg);
-       GEOSGeometry *gepall = LWGEOM2GEOS((LWGEOM*)epall);
+       GEOSGeometry *gepall = LWGEOM2GEOS((LWGEOM*)epall, 1);
        lwmpoint_free(epall);
        if ( ! gepall ) {
                lwerror("LWGEOM2GEOS: %s", lwgeom_geos_errmsg);
@@ -146,7 +146,7 @@ lwgeom_node(const LWGEOM* lwgeom_in)
        }
 
        initGEOS(lwgeom_geos_error, lwgeom_geos_error);
-       g1 = LWGEOM2GEOS(lwgeom_in);
+       g1 = LWGEOM2GEOS(lwgeom_in, 1);
        if ( ! g1 ) {
                lwerror("LWGEOM2GEOS: %s", lwgeom_geos_errmsg);
                return NULL;

diff --git a/liblwgeom/lwgeom_geos_split.c b/liblwgeom/lwgeom_geos_split.c
index f9233a376fa43d6a2c3d011bc57d05a663c06761..6d76cf73a311c2b90f0777f987bec56b065ef0ec 100644 (file)
--- a/liblwgeom/lwgeom_geos_split.c
+++ b/liblwgeom/lwgeom_geos_split.c
@@ -69,13 +69,13 @@ lwline_split_by_line(const LWLINE* lwline_in, const LWLINE* blade_in)
 
        initGEOS(lwgeom_geos_error, lwgeom_geos_error);
 
-       g1 = LWGEOM2GEOS((LWGEOM*)lwline_in);
+       g1 = LWGEOM2GEOS((LWGEOM*)lwline_in, 0);
        if ( ! g1 )
        {
                lwerror("LWGEOM2GEOS: %s", lwgeom_geos_errmsg);
                return NULL;
        }
-       g2 = LWGEOM2GEOS((LWGEOM*)blade_in);
+       g2 = LWGEOM2GEOS((LWGEOM*)blade_in, 0);
        if ( ! g2 )
        {
                GEOSGeom_destroy(g1);
@@ -264,7 +264,7 @@ lwpoly_split_by_line(const LWPOLY* lwpoly_in, const LWLINE* blade_in)
 
        initGEOS(lwgeom_geos_error, lwgeom_geos_error);
 
-       g1 = LWGEOM2GEOS((LWGEOM*)lwpoly_in);
+       g1 = LWGEOM2GEOS((LWGEOM*)lwpoly_in, 0);
        if ( NULL == g1 )
        {
                lwerror("LWGEOM2GEOS: %s", lwgeom_geos_errmsg);
@@ -278,7 +278,7 @@ lwpoly_split_by_line(const LWPOLY* lwpoly_in, const LWLINE* blade_in)
                return NULL;
        }
 
-       g2 = LWGEOM2GEOS((LWGEOM*)blade_in);
+       g2 = LWGEOM2GEOS((LWGEOM*)blade_in, 0);
        if ( NULL == g2 )
        {
                GEOSGeom_destroy(g1);

diff --git a/raster/rt_core/rt_geometry.c b/raster/rt_core/rt_geometry.c
index e0006063840a759f9953365c245d4f9de0845f44..1b1791f601605969cfb4354f812a1198301b66ae 100644 (file)
--- a/raster/rt_core/rt_geometry.c
+++ b/raster/rt_core/rt_geometry.c
@@ -465,7 +465,7 @@ rt_errorstate rt_raster_surface(rt_raster raster, int nband, LWMPOLY **surface)
                        }
 #endif
 
-                       geoms[i] = LWGEOM2GEOS(lwpoly_as_lwgeom(gv[i].geom));
+                       geoms[i] = LWGEOM2GEOS(lwpoly_as_lwgeom(gv[i].geom), 0);
                        lwpoly_free(gv[i].geom);
                }
                rtdealloc(gv);
@@ -1259,7 +1259,7 @@ rt_raster_gdal_polygonize(
                        break;
 #endif
 
-                       ggeom = (GEOSGeometry *) LWGEOM2GEOS(lwgeom);
+                       ggeom = (GEOSGeometry *) LWGEOM2GEOS(lwgeom, 0);
                        if (ggeom == NULL) {
                                rtwarn("Cannot test geometry for validity");
                                break;

diff --git a/raster/rt_core/rt_raster.c b/raster/rt_core/rt_raster.c
index cbb0ff9d3d53932872e245b9aa84a23f6bbaa595..eff0cf3f1317341f2db4791941260708e0a19ef0 100644 (file)
--- a/raster/rt_core/rt_raster.c
+++ b/raster/rt_core/rt_raster.c
@@ -1235,7 +1235,7 @@ rt_raster_compute_skewed_raster(
                        return NULL;
                }
 
-               ngeom = (GEOSGeometry *) LWGEOM2GEOS(lwpoly_as_lwgeom(npoly));
+               ngeom = (GEOSGeometry *) LWGEOM2GEOS(lwpoly_as_lwgeom(npoly), 0);
                lwpoly_free(npoly);
        }
 
@@ -1250,7 +1250,7 @@ rt_raster_compute_skewed_raster(
                        return NULL;
                }
 
-               sgeom = (GEOSGeometry *) LWGEOM2GEOS(geom);
+               sgeom = (GEOSGeometry *) LWGEOM2GEOS(geom, 0);
                lwgeom_free(geom);
 
                covers = GEOSRelatePattern(sgeom, ngeom, "******FF*");
@@ -1298,7 +1298,7 @@ rt_raster_compute_skewed_raster(
                                return NULL;
                        }
 
-                       sgeom = (GEOSGeometry *) LWGEOM2GEOS(geom);
+                       sgeom = (GEOSGeometry *) LWGEOM2GEOS(geom, 0);
                        lwgeom_free(geom);
 
                        covers = GEOSRelatePattern(sgeom, ngeom, "******FF*");
@@ -2732,13 +2732,13 @@ rt_raster_gdal_rasterize(
                        return NULL;
                }
 
-               egeom = (GEOSGeometry *) LWGEOM2GEOS(lwpoly_as_lwgeom(epoly));
+               egeom = (GEOSGeometry *) LWGEOM2GEOS(lwpoly_as_lwgeom(epoly), 0);
                lwpoly_free(epoly);
 
                /* convert WKB to geometry */
                RASTER_DEBUG(4, "Converting WKB to geometry");
                lwgeom = lwgeom_from_wkb(wkb, wkb_len, LW_PARSER_CHECK_NONE);
-               geom = (GEOSGeometry *) LWGEOM2GEOS(lwgeom);
+               geom = (GEOSGeometry *) LWGEOM2GEOS(lwgeom, 0);
                lwgeom_free(lwgeom);
 
                result = GEOSRelatePattern(egeom, geom, "T**FF*FF*");

diff --git a/raster/rt_core/rt_spatial_relationship.c b/raster/rt_core/rt_spatial_relationship.c
index cf4fa64fc956601b5b9f8a3aafac490beac20574..53ac0683674da33d80332a57ae104db5ee486524 100644 (file)
--- a/raster/rt_core/rt_spatial_relationship.c
+++ b/raster/rt_core/rt_spatial_relationship.c
@@ -193,7 +193,7 @@ rt_errorstate rt_raster_geos_spatial_relationship(
        }
 
        /* convert LWMPOLY to GEOSGeometry */
-       geom1 = LWGEOM2GEOS(lwmpoly_as_lwgeom(surface1));
+       geom1 = LWGEOM2GEOS(lwmpoly_as_lwgeom(surface1), 0);
        lwmpoly_free(surface1);
        if (geom1 == NULL) {
                rterror("rt_raster_geos_spatial_relationship: Could not convert surface of the specified band from the first raster to a GEOSGeometry");
@@ -201,7 +201,7 @@ rt_errorstate rt_raster_geos_spatial_relationship(
                return ES_ERROR;
        }
 
-       geom2 = LWGEOM2GEOS(lwmpoly_as_lwgeom(surface2));
+       geom2 = LWGEOM2GEOS(lwmpoly_as_lwgeom(surface2), 0);
        lwmpoly_free(surface2);
        if (geom2 == NULL) {
                rterror("rt_raster_geos_spatial_relationship: Could not convert surface of the specified band from the second raster to a GEOSGeometry");
@@ -1079,7 +1079,7 @@ rt_raster_intersects(
                                rtn = 0;
                                break;
                        }
-                       ghull[i] = (GEOSGeometry *) LWGEOM2GEOS(hull[i]);
+                       ghull[i] = (GEOSGeometry *) LWGEOM2GEOS(hull[i], 0);
                        if (NULL == ghull[i]) {
                                for (j = 0; j < i; j++) {
                                        GEOSGeom_destroy(ghull[j]);