Additional tweaking of returning empty raster from map algebra of

INTERSECTION or UNION extent

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

diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c
index f65f200564b396fa54c7fa53257c9882d05b98f2..3f359c5d22593545ad060a5d6be552dc82a8045e 100644 (file)
--- a/raster/rt_core/rt_api.c
+++ b/raster/rt_core/rt_api.c
@@ -13482,7 +13482,7 @@ rt_raster_iterator(
                                        _rti_param_destroy(_param);
 
                                        *noerr = 1;
-                                       return NULL;
+                                       return rast;
                                }
 
                                rtnrast = rast;

diff --git a/raster/test/regress/rt_mapalgebra_expected b/raster/test/regress/rt_mapalgebra_expected
index 575cb668be5690245cfe44d5a10e5eb5c85eddca..51c5c302147cfdb48ae7a90584e593da34f84122 100644 (file)
--- a/raster/test/regress/rt_mapalgebra_expected
+++ b/raster/test/regress/rt_mapalgebra_expected
@@ -131,7 +131,8 @@ NOTICE:  pos = [0:2][1:2]={{1,1},{2,2},{1,1}}
 NOTICE:  userargs = <NULL>
 20|21|(1,-1,1,1,1,-1,0,0,0,1)|(16BUI,0,f,)
 NOTICE:  rt_raster_iterator: Computed raster for intersection extent is empty
-20|22||
+NOTICE:  Raster provided has no bands
+20|22|(0,0,0,0,0,0,0,0,0,0)|(,,,)
 NOTICE:  value = {{{2}},{{3}}}
 NOTICE:  pos = [0:2][1:2]={{1,1},{1,2},{2,1}}
 NOTICE:  userargs = <NULL>
@@ -266,7 +267,8 @@ NOTICE:  pos = [0:3][1:2]={{2,2},{2,4},{1,3},{2,2}}
 NOTICE:  userargs = <NULL>
 20|21|22|(0,-2,2,2,1,-1,0,0,0,1)|(16BUI,0,f,)
 NOTICE:  rt_raster_iterator: Computed raster for intersection extent is empty
-20|21|22||
+NOTICE:  Raster provided has no bands
+20|21|22|(0,0,0,0,0,0,0,0,0,0)|(,,,)
 NOTICE:  value = {{{1}},{{10}},{{100}}}
 NOTICE:  pos = [0:3][1:2]={{1,1},{1,1},{1,1},{1,1}}
 NOTICE:  userargs = <NULL>