Code and comments cleanup.

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

diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c
index f3f8baf56946e1fbaeb84c8ec5fa6243691b6d11..183cc27d919727e3c705e1bd0d56effa7ef42509 100644 (file)
--- a/raster/rt_core/rt_api.c
+++ b/raster/rt_core/rt_api.c
@@ -1649,7 +1649,7 @@ rt_band_load_offline_data(rt_band band) {
 
        band->data.offline.mem = _band->data.mem;
 
-       rtdealloc(_band); /* cannot use rt_band_destory */
+       rtdealloc(_band); /* cannot use rt_band_destroy */
        rt_raster_destroy(_rast);
 
        return 0;

diff --git a/raster/rt_pg/rt_pg.c b/raster/rt_pg/rt_pg.c
index 002f02e6c3f2b2260db4e50c4b15ec24c09c7db3..be740b5faf00d22b8710125e51413e734909404e 100644 (file)
--- a/raster/rt_pg/rt_pg.c
+++ b/raster/rt_pg/rt_pg.c
@@ -147,13 +147,13 @@ static char *rtpg_getSR(int srid);
  *   Example: PG_DETOAST_DATUM_SLICE(PG_GETARG_DATUM(0), 0,
  *     sizeof(struct rt_raster_serialized_t))
  *
- * When ONLY setting raster or band(s) metadata, use PG_DETOAST_DATUM() as
- *   rt_raster_deserialize() allocates local memory for the raster and
- *   band(s) metadata.
+ * When ONLY setting raster or band(s) metadata OR reading band data, use
+ *   PG_DETOAST_DATUM() as rt_raster_deserialize() allocates local memory
+ *   for the raster and band(s) metadata.
  *
  *   Example: PG_DETOAST_DATUM(PG_GETARG_DATUM(0))
  *
- * When setting band pixel values, use PG_DETOAST_DATUM_COPY().  This is
+ * When SETTING band pixel values, use PG_DETOAST_DATUM_COPY().  This is
  *   because band data (not metadata) is just a pointer to the correct
  *   memory location in the detoasted datum.  What is returned from
  *   PG_DETOAST_DATUM() may or may not be a copy of the input datum.
@@ -2470,12 +2470,12 @@ Datum RASTER_setPixelValue(PG_FUNCTION_ARGS)
        POSTGIS_RT_DEBUGF(3, "Pixel coordinates (%d, %d)", x, y);
 
        /* Deserialize raster */
-       pgraster = (rt_pgraster *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+       pgraster = (rt_pgraster *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
 
        raster = rt_raster_deserialize(pgraster, FALSE);
        if (!raster) {
                elog(ERROR, "RASTER_setPixelValue: Could not deserialize raster");
-               PG_FREE_IF_COPY(pgraster, 0);
+               pfree(pgraster);
                PG_RETURN_NULL();
        }
 
@@ -2486,6 +2486,7 @@ Datum RASTER_setPixelValue(PG_FUNCTION_ARGS)
                        elog(NOTICE, "Could not find raster band of index %d when setting "
                                "pixel value. Value not set. Returning original raster",
                                bandindex);
+                       PG_RETURN_POINTER(pgraster);
                }
                else {
                        /* Set the pixel value */
@@ -2494,6 +2495,7 @@ Datum RASTER_setPixelValue(PG_FUNCTION_ARGS)
                                        elog(NOTICE, "Raster do not have a nodata value defined. "
                                                "Set band nodata value first. Nodata value not set. "
                                                "Returning original raster");
+                                       PG_RETURN_POINTER(pgraster);
                                }
                                else {
                                        pixvalue = rt_band_get_nodata(band);
@@ -2570,7 +2572,7 @@ Datum RASTER_setPixelValuesArray(PG_FUNCTION_ARGS)
        /* pgraster is null, return null */
        if (PG_ARGISNULL(0))
                PG_RETURN_NULL();
-       pgraster = (rt_pgraster *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+       pgraster = (rt_pgraster *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
 
        /* raster */
        raster = rt_raster_deserialize(pgraster, FALSE);
@@ -2641,7 +2643,7 @@ Datum RASTER_setPixelValuesArray(PG_FUNCTION_ARGS)
                default:
                        elog(ERROR, "RASTER_setPixelValuesArray: Invalid data type for new values");
                        rt_raster_destroy(raster);
-                       PG_FREE_IF_COPY(pgraster, 0);
+                       pfree(pgraster);
                        PG_RETURN_NULL();
                        break;
        }
@@ -2682,7 +2684,7 @@ Datum RASTER_setPixelValuesArray(PG_FUNCTION_ARGS)
                        pfree(nulls);
                }
                rt_raster_destroy(raster);
-               PG_FREE_IF_COPY(pgraster, 0);
+               pfree(pgraster);
                PG_RETURN_NULL();
        }
 
@@ -2694,7 +2696,7 @@ Datum RASTER_setPixelValuesArray(PG_FUNCTION_ARGS)
                pfree(elements);
                pfree(nulls);
                rt_raster_destroy(raster);
-               PG_FREE_IF_COPY(pgraster, 0);
+               pfree(pgraster);
                PG_RETURN_NULL();
        }
 
@@ -2728,7 +2730,7 @@ Datum RASTER_setPixelValuesArray(PG_FUNCTION_ARGS)
                                                pfree(pixval);
 
                                                rt_raster_destroy(raster);
-                                               PG_FREE_IF_COPY(pgraster, 0);
+                                               pfree(pgraster);
                                                PG_RETURN_NULL();
                                                break;
                                }
@@ -2754,7 +2756,7 @@ Datum RASTER_setPixelValuesArray(PG_FUNCTION_ARGS)
                                elog(ERROR, "RASTER_setPixelValuesArray: Invalid data type for noset flags");
                                pfree(pixval);
                                rt_raster_destroy(raster);
-                               PG_FREE_IF_COPY(pgraster, 0);
+                               pfree(pgraster);
                                PG_RETURN_NULL();
                                break;
                }
@@ -2797,7 +2799,7 @@ Datum RASTER_setPixelValuesArray(PG_FUNCTION_ARGS)
                                pfree(nulls);
                        }
                        rt_raster_destroy(raster);
-                       PG_FREE_IF_COPY(pgraster, 0);
+                       pfree(pgraster);
                        PG_RETURN_NULL();
                }
 
@@ -2889,7 +2891,7 @@ Datum RASTER_setPixelValuesArray(PG_FUNCTION_ARGS)
                                elog(ERROR, "Cannot get value of pixel.  Returning NULL");
                                pfree(pixval);
                                rt_raster_destroy(raster);
-                               PG_FREE_IF_COPY(pgraster, 0);
+                               pfree(pgraster);
                                PG_RETURN_NULL();
                        }
 
@@ -2913,7 +2915,7 @@ Datum RASTER_setPixelValuesArray(PG_FUNCTION_ARGS)
        /* serialize new raster */
        pgrtn = rt_raster_serialize(raster);
        rt_raster_destroy(raster);
-       PG_FREE_IF_COPY(pgraster, 0);
+       pfree(pgraster);
        if (!pgrtn)
                PG_RETURN_NULL();
 
@@ -4250,7 +4252,7 @@ Datum RASTER_addBandRasterArray(PG_FUNCTION_ARGS)
 
        /* destination raster */
        if (!PG_ARGISNULL(0)) {
-               pgraster = (rt_pgraster *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
+               pgraster = (rt_pgraster *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
 
                /* raster */
                raster = rt_raster_deserialize(pgraster, FALSE);
@@ -4416,10 +4418,8 @@ Datum RASTER_addBandRasterArray(PG_FUNCTION_ARGS)
                                rt_raster_destroy(raster);
                                pfree(nulls);
                                pfree(e);
-                               if (pgraster != NULL) {
-                                       PG_FREE_IF_COPY(pgraster, 0);
-                                       PG_RETURN_DATUM(PG_GETARG_DATUM(0));
-                               }
+                               if (pgraster != NULL)
+                                       PG_RETURN_POINTER(pgraster);
                                else
                                        PG_RETURN_NULL();
                        }
@@ -8952,6 +8952,9 @@ Datum RASTER_reclass(PG_FUNCTION_ARGS) {
                        PG_RETURN_NULL();
                }
 
+               /* old band is in the variable band */
+               rt_band_destroy(band);
+
                /* free exprset */
                for (k = 0; k < j; k++) pfree(exprset[k]);
                pfree(exprset);