Remove gserialized_on conditionals. Only type defines remain to be cleared out.

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

diff --git a/postgis/lwgeom_box3d.c b/postgis/lwgeom_box3d.c
index 3058fa86e8dd1e83fed855ea6cac8343c7bc9117..84b2f606fecb6e4a7bc3926cc4b3bca69077d988 100644 (file)
--- a/postgis/lwgeom_box3d.c
+++ b/postgis/lwgeom_box3d.c
@@ -193,11 +193,7 @@ PG_FUNCTION_INFO_V1(BOX3D_to_BOX2DFLOAT4);
 Datum BOX3D_to_BOX2DFLOAT4(PG_FUNCTION_ARGS)
 {
        BOX3D *in = (BOX3D *)PG_GETARG_POINTER(0);
-#ifdef GSERIALIZED_ON
        BOX2DFLOAT4 *out = box3d_to_gbox(in);
-#else
-       BOX2DFLOAT4 *out = box3d_to_box2df(in);
-#endif
        PG_RETURN_POINTER(out);
 }
 

diff --git a/postgis/lwgeom_functions_basic.c b/postgis/lwgeom_functions_basic.c
index 3246a55134dc27ec7e63ffd850821274ee8d1d2a..bdf264bd247b3890b1a8d27aac436f528941b704 100644 (file)
--- a/postgis/lwgeom_functions_basic.c
+++ b/postgis/lwgeom_functions_basic.c
@@ -1072,13 +1072,11 @@ Datum LWGEOM_collect(PG_FUNCTION_ARGS)
 
        POSTGIS_DEBUGF(3, "LWGEOM_collect(%s, %s): call", lwtype_name(pglwgeom_get_type(pglwgeom1)), lwtype_name(pglwgeom_get_type(pglwgeom2)));
 
-#ifdef GSERIALIZED_ON
        if ( FLAGS_GET_ZM(pglwgeom1->flags) != FLAGS_GET_ZM(pglwgeom2->flags) )
        {
                elog(ERROR,"Cannot ST_Collect geometries with differing dimensionality.");
                PG_RETURN_NULL();
        }
-#endif
 
        srid = pglwgeom_get_srid(pglwgeom1);
        error_if_srid_mismatch(srid, pglwgeom_get_srid(pglwgeom2));
@@ -2052,13 +2050,10 @@ Datum ST_IsCollection(PG_FUNCTION_ARGS)
        int type;
        size_t size;
 
-       /* Pull only a small amount of the tuple,
-       * enough to get the type. size = header + type */
-#ifdef GSERIALIZED_ON
-       size = VARHDRSZ + 8 + 32 + 4;  /* header + srid/flags + bbox? + type number */
-#else 
-       size = VARHDRSZ + 1; /* header + type numer */
-#endif
+       /* Pull only a small amount of the tuple, enough to get the type. */
+       /* header + srid/flags + bbox? + type number */
+       size = VARHDRSZ + 8 + 32 + 4;  
+
        geom = (PG_LWGEOM*)PG_DETOAST_DATUM_SLICE(PG_GETARG_DATUM(0), 0, size);
 
        type = pglwgeom_get_type(geom);

diff --git a/postgis/lwgeom_geos.c b/postgis/lwgeom_geos.c
index c0af662149c212a55bd4a1e25198b018a16452d4..bb6bea41d875b5c84c7763d053180a66d1c837cf 100644 (file)
--- a/postgis/lwgeom_geos.c
+++ b/postgis/lwgeom_geos.c
@@ -840,13 +840,9 @@ Datum convexhull(PG_FUNCTION_ARGS)
        /* Copy input bbox if any */
        if ( pglwgeom_getbox2d_p(geom1, &bbox) )
        {
-#ifdef GSERIALIZED_ON
                /* Force the box to have the same dimensionality as the lwgeom */
                bbox.flags = lwout->flags;
                lwout->bbox = gbox_copy(&bbox);
-#else
-               lwout->bbox = gbox_from_box2df(lwout->flags, &bbox);
-#endif
        }
 
        result = pglwgeom_serialize(lwout);

diff --git a/raster/rt_pg/rt_pg.c b/raster/rt_pg/rt_pg.c
index f0db8d9cd832d3a69a152810969ec8fd8af58b7a..d1841f347b66307116db16da5488b25ad5c975cd 100644 (file)
--- a/raster/rt_pg/rt_pg.c
+++ b/raster/rt_pg/rt_pg.c
@@ -696,8 +696,8 @@ Datum RASTER_convex_hull(PG_FUNCTION_ARGS)
 {
     rt_pgraster *pgraster;
     rt_raster raster;
-    LWPOLY* convexhull;
-    uint8_t* pglwgeom;
+    LWPOLY* convexhull = NULL;
+    GSERIALIZED* gser = NULL;
 
                if (PG_ARGISNULL(0)) PG_RETURN_NULL();
                pgraster = (rt_pgraster *) PG_DETOAST_DATUM_SLICE(PG_GETARG_DATUM(0), 0, sizeof(struct rt_raster_serialized_t));
@@ -717,25 +717,16 @@ Datum RASTER_convex_hull(PG_FUNCTION_ARGS)
     }
 
     {
-#ifdef GSERIALIZED_ON
         size_t gser_size;
-        GSERIALIZED *gser;
         gser = gserialized_from_lwgeom(lwpoly_as_lwgeom(convexhull), 0, &gser_size);
         SET_VARSIZE(gser, gser_size);
-        pglwgeom = (uint8_t*)gser;
-#else
-        size_t sz = lwpoly_serialize_size(convexhull);
-        pglwgeom = palloc(VARHDRSZ+sz);
-        lwpoly_serialize_buf(convexhull, (uint8_t*)VARDATA(pglwgeom), &sz);
-        SET_VARSIZE(pglwgeom, VARHDRSZ+sz);
-#endif
     }
 
     /* Free raster and lwgeom memory */
     rt_raster_destroy(raster);
     lwfree(convexhull);
 
-    PG_RETURN_POINTER(pglwgeom);
+    PG_RETURN_POINTER(gser);
 }
 
 
@@ -6713,11 +6704,7 @@ Datum RASTER_getGDALDrivers(PG_FUNCTION_ARGS)
 PG_FUNCTION_INFO_V1(RASTER_asRaster);
 Datum RASTER_asRaster(PG_FUNCTION_ARGS)
 {
-#ifdef GSERIALIZED_ON
        GSERIALIZED *pggeom = NULL;
-#else
-       unsigned char *pggeom = NULL;
-#endif
 
        LWGEOM *geom = NULL;
        rt_raster rast = NULL;
@@ -6788,14 +6775,11 @@ Datum RASTER_asRaster(PG_FUNCTION_ARGS)
        /* based upon LWGEOM_asBinary function in postgis/lwgeom_ogc.c */
 
        /* Get the geometry */
-       if (PG_ARGISNULL(0)) PG_RETURN_NULL();
-#ifdef GSERIALIZED_ON
+       if (PG_ARGISNULL(0)) 
+           PG_RETURN_NULL();
+
        pggeom = (GSERIALIZED *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
        geom = lwgeom_from_gserialized(pggeom);
-#else
-       pggeom = (unsigned char *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-       geom = lwgeom_deserialize(SERIALIZED_FORM(pggeom));
-#endif
 
        /* Get a 2D version of the geometry if necessary */
        if (FLAGS_NDIMS(geom->flags) > 2) {
@@ -7205,11 +7189,7 @@ Datum RASTER_asRaster(PG_FUNCTION_ARGS)
        }
 
        /* get geometry's srid */
-#ifdef GSERIALIZED_ON
        srid = gserialized_get_srid(pggeom);
-#else
-       srid = lwgeom_getsrid(pggeom);
-#endif
 
        POSTGIS_RT_DEBUGF(3, "RASTER_asRaster: srid = %d", srid);
        if (clamp_srid(srid) != SRID_UNKNOWN) {