Changes between Version 14 and Version 15 of DevWikiPostGISCoding

Timestamp:

03/14/12 15:01:26 (13 years ago)

Author:

pramsey

Comment:

—

DevWikiPostGISCoding

@@ -108 +108 @@
 Datum shortestline2d(PG_FUNCTION_ARGS)
 {
-       PG_LWGEOM *result;
+       GSERIALIZED *result;
        LWGEOM *theline;
 
-       /* Detoast the actual PgSQL varlena structures, in our case PG_LWGEOM (soon to be GSERIALIZED) */
-       PG_LWGEOM *geom1 = (PG_LWGEOM*)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-       PG_LWGEOM *geom2 = (PG_LWGEOM*)PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
+       /* Detoast the actual PgSQL varlena structures, in our case GSERIALIZED */
+       GSERIALIZED *geom1 = (GSERIALIZED*)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+       GSERIALIZED *geom2 = (GSERIALIZED*)PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
 
        /* Build LWGEOM from the varlena (soon to be with lwgeom_from_gserialized) */
-       LWGEOM *lwgeom1 = pglwgeom_deserialize(geom1);
-       LWGEOM *lwgeom2 = pglwgeom_deserialize(geom2);
+       LWGEOM *lwgeom1 = lwgeom_from_gserialized(geom1);
+       LWGEOM *lwgeom2 = lwgeom_from_gserialized(geom2);
 
        /* SRID consistency test */
@@ -131 +131 @@
                PG_RETURN_NULL();
 
-       /* Serialize the result back down from LWGEOM, but don't return right away */
-       result = pglwgeom_serialize(theline);
-
-       /* First free the LWGEOMs you used */
-       lwgeom_free(theline);
+       /* Finished with the input LWGEOMs */
        lwgeom_free(lwgeom1);
        lwgeom_free(lwgeom2);
+
+       /* Serialize the result back down from LWGEOM, but don't return right away */
+       result = geometry_serialize(theline);
+
+       /* Finished with the derived LWGEOM */
+       lwgeom_free(theline);
 
        /* Then call free_if_copy on the *varlena* structures you originally get as arguments */