Refactored ST_Transform in preparation for additional refactoring to accomodate ST_Re...

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

diff --git a/raster/rt_pg/rt_pg.c b/raster/rt_pg/rt_pg.c
index 7e0da1300bad5e04b9806b31ee4899d8964ff669..feddab648fd2e33d5fe0d21f6b4b1e4af6adf3dc 100644 (file)
--- a/raster/rt_pg/rt_pg.c
+++ b/raster/rt_pg/rt_pg.c
@@ -238,8 +238,8 @@ Datum RASTER_reclass(PG_FUNCTION_ARGS);
 Datum RASTER_asGDALRaster(PG_FUNCTION_ARGS);
 Datum RASTER_getGDALDrivers(PG_FUNCTION_ARGS);
 
-/* transform a raster to a new projection */
-Datum RASTER_transform(PG_FUNCTION_ARGS);
+/* resample a raster */
+Datum RASTER_resample(PG_FUNCTION_ARGS);
 
 /* get raster's meta data */
 Datum RASTER_metadata(PG_FUNCTION_ARGS);
@@ -4880,10 +4880,10 @@ Datum RASTER_getGDALDrivers(PG_FUNCTION_ARGS)
 }
 
 /**
- * Transform a raster to a new projection
+ * Resample a raster
  */
-PG_FUNCTION_INFO_V1(RASTER_transform);
-Datum RASTER_transform(PG_FUNCTION_ARGS)
+PG_FUNCTION_INFO_V1(RASTER_resample);
+Datum RASTER_resample(PG_FUNCTION_ARGS)
 {
        rt_pgraster *pgraster = NULL;
        rt_pgraster *pgrast = NULL;
@@ -4903,7 +4903,7 @@ Datum RASTER_transform(PG_FUNCTION_ARGS)
        double *scale_x = NULL;
        double *scale_y = NULL;
 
-       POSTGIS_RT_DEBUG(3, "RASTER_transform: Starting");
+       POSTGIS_RT_DEBUG(3, "RASTER_resample: Starting");
 
        /* pgraster is null, return null */
        if (PG_ARGISNULL(0)) PG_RETURN_NULL();
@@ -4912,14 +4912,14 @@ Datum RASTER_transform(PG_FUNCTION_ARGS)
        /* raster */
        raster = rt_raster_deserialize(pgraster, FALSE);
        if (!raster) {
-               elog(ERROR, "RASTER_transform: Could not deserialize raster");
+               elog(ERROR, "RASTER_resample: Could not deserialize raster");
                PG_RETURN_NULL();
        }
 
        /* source srid */
        src_srid = rt_raster_get_srid(raster);
        if (src_srid == SRID_UNKNOWN) {
-               elog(ERROR, "RASTER_transform: Input raster has unknown (-1) SRID");
+               elog(ERROR, "RASTER_resample: Input raster has unknown (-1) SRID");
                rt_raster_destroy(raster);
                PG_RETURN_NULL();
        }
@@ -4929,7 +4929,7 @@ Datum RASTER_transform(PG_FUNCTION_ARGS)
        if (PG_ARGISNULL(1)) PG_RETURN_NULL();
        dst_srid = PG_GETARG_INT32(1);
        if (dst_srid == SRID_UNKNOWN) {
-               elog(ERROR, "RASTER_transform: -1 is an invalid target SRID");
+               elog(ERROR, "RASTER_resample: -1 is an invalid target SRID");
                rt_raster_destroy(raster);
                PG_RETURN_NULL();
        }
@@ -4954,7 +4954,7 @@ Datum RASTER_transform(PG_FUNCTION_ARGS)
        /* source srs */
        src_srs = getSRTextSPI(src_srid);
        if (NULL == src_srs) {
-               elog(ERROR, "RASTER_transform: Input raster has unknown SRID (%d)", src_srid);
+               elog(ERROR, "RASTER_resample: Input raster has unknown SRID (%d)", src_srid);
                rt_raster_destroy(raster);
                PG_RETURN_NULL();
        }
@@ -4963,7 +4963,7 @@ Datum RASTER_transform(PG_FUNCTION_ARGS)
        /* target srs */
        dst_srs = getSRTextSPI(dst_srid);
        if (NULL == dst_srs) {
-               elog(ERROR, "RASTER_transform: Target SRID (%d) is unknown", dst_srid);
+               elog(ERROR, "RASTER_resample: Target SRID (%d) is unknown", dst_srid);
                rt_raster_destroy(raster);
                if (NULL != src_srs) pfree(src_srs);
                PG_RETURN_NULL();

diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c
index 268d9ca626d512b9caf2c85a77cbb3f80afdc37f..a5ba2c51069a1c4f43ca395d441e06d35b875b95 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in.c
+++ b/raster/rt_pg/rtpostgis.sql.in.c
@@ -1430,7 +1430,7 @@ CREATE OR REPLACE FUNCTION st_aspng(rast raster, nband int, compression int)
 -----------------------------------------------------------------------
 CREATE OR REPLACE FUNCTION st_transform(rast raster, srid integer, algorithm text DEFAULT 'NearestNeighbour', maxerr double precision DEFAULT 0.125, scalex double precision DEFAULT 0, scaley double precision DEFAULT 0)
        RETURNS raster
-       AS 'MODULE_PATHNAME', 'RASTER_transform'
+       AS 'MODULE_PATHNAME', 'RASTER_resample'
        LANGUAGE 'C' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_transform(rast raster, srid integer, scalex double precision, scaley double precision, algorithm text DEFAULT 'NearestNeighbour', maxerr double precision DEFAULT 0.125)