Clamp SRID when comparing SRIDs of raster vs geometry for geomval

variant of ST_SetValues()

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

diff --git a/raster/rt_pg/rt_pg.c b/raster/rt_pg/rt_pg.c
index 0cf2b7900bc287ee8e7f9324919f58dae6ab91fc..16457547699f0c20101568d4c815fd1ae8f3561c 100644 (file)
--- a/raster/rt_pg/rt_pg.c
+++ b/raster/rt_pg/rt_pg.c
@@ -3540,7 +3540,7 @@ Datum RASTER_setPixelValuesGeomval(PG_FUNCTION_ARGS)
        numbands = rt_raster_get_num_bands(raster);
        width = rt_raster_get_width(raster);
        height = rt_raster_get_height(raster);
-       srid = rt_raster_get_srid(raster);
+       srid = clamp_srid(rt_raster_get_srid(raster));
        rt_raster_get_geotransform_matrix(raster, gt);
 
        /* nband */
@@ -3652,7 +3652,7 @@ Datum RASTER_setPixelValuesGeomval(PG_FUNCTION_ARGS)
                }
 
                /* check SRID */
-               if (gserialized_get_srid(gser) != srid) {
+               if (clamp_srid(gserialized_get_srid(gser)) != srid) {
                        elog(NOTICE, "Geometry provided for geomval at index %d does not have the same SRID as the raster: %d. Returning original raster", i, srid);
                        rtpg_setvaluesgv_arg_destroy(arg);
                        rt_raster_destroy(raster);