-Return NULL if raster is NULL in RASTER_addband

-Warn if first raster is NULL in RASTER_copyband and return NULL

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

diff --git a/raster/rt_pg/rt_pg.c b/raster/rt_pg/rt_pg.c
index a6bdeecf7717c1fe127997fb67c7dfdcd6b40dfa..decb44a2a887ca01a0d1d7ed6ddadb2214b5389e 100644 (file)
--- a/raster/rt_pg/rt_pg.c
+++ b/raster/rt_pg/rt_pg.c
@@ -1770,6 +1770,11 @@ Datum RASTER_addband(PG_FUNCTION_ARGS)
     }
 
     /* Deserialize raster */
+    if (PG_ARGISNULL(0)) {
+        /* Simply return NULL */
+        elog(NOTICE, "Raster can not be NULL. Returning NULL");
+        PG_RETURN_NULL();
+    }
     pgraster = (rt_pgraster *)PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
     ctx = get_rt_context(fcinfo);
 
@@ -1850,8 +1855,11 @@ Datum RASTER_copyband(PG_FUNCTION_ARGS)
     rt_context ctx = NULL;
 
     /* Deserialize torast */
-    if (PG_ARGISNULL(0))
+    if (PG_ARGISNULL(0)) {
+        /* Simply return NULL */
+        elog(NOTICE, "First raster can not be NULL. Returning NULL");
         PG_RETURN_NULL();
+    }
     pgraster = (rt_pgraster *)PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
     ctx = get_rt_context(fcinfo);