Fixed optimization bug in 1-raster ST_MapAlgebraExpr. Ticket is #1515.

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

diff --git a/raster/rt_pg/rt_pg.c b/raster/rt_pg/rt_pg.c
index 83fe02e674f4a6fa88265d917e1610d16fb4b1bd..cf69cd1dbd27b8ecb42bae65df66f2289cf99b04 100644 (file)
--- a/raster/rt_pg/rt_pg.c
+++ b/raster/rt_pg/rt_pg.c
@@ -2797,7 +2797,7 @@ Datum RASTER_mapAlgebraExpr(PG_FUNCTION_ARGS)
         POSTGIS_RT_DEBUGF(4, "RASTER_mapAlgebraExpr: New raster has %d bands",
                 rt_raster_get_num_bands(newrast));
 
-        rt_raster_copy_band(raster, newrast, nband - 1, 0);
+        rt_raster_copy_band(newrast, raster, nband - 1, 0);
 
         POSTGIS_RT_DEBUGF(4, "RASTER_mapAlgebraExpr: New raster now has %d bands",
                 rt_raster_get_num_bands(newrast));

diff --git a/raster/test/regress/rt_mapalgebraexpr_expected b/raster/test/regress/rt_mapalgebraexpr_expected
index d89238726b9ddb8f6cc32c50bbcc9d541d224a56..3478afd0fc82abb67aeeb06a4171366a0d33f45e 100644 (file)
--- a/raster/test/regress/rt_mapalgebraexpr_expected
+++ b/raster/test/regress/rt_mapalgebraexpr_expected
@@ -7,9 +7,7 @@ T2|t
 T3||19
 T4||2
 T5||2
-NOTICE:  rt_raster_copy_band: Second raster has no band
-NOTICE:  Could not find raster band of index 1 when getting pixel value. Returning NULL
-T6||
+T6||-1
 T7|100|
 T8|100|120
 T9|101|