From cff576de113250cc81505b4c4769215920f85ae3 Mon Sep 17 00:00:00 2001 From: Bborie Park Date: Tue, 16 Oct 2012 19:55:41 +0000 Subject: [PATCH] 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 --- raster/rt_core/rt_api.c | 2 +- raster/test/regress/rt_mapalgebra_expected | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c index f65f20056..3f359c5d2 100644 --- 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 575cb668b..51c5c3021 100644 --- 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 = 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 = @@ -266,7 +267,8 @@ NOTICE: pos = [0:3][1:2]={{2,2},{2,4},{1,3},{2,2}} NOTICE: userargs = 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 = -- 2.50.1