Fixed conversion of pixel types between PostGIS raster and GDAL. Essentially PostGIS...

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

diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c
index 91784f009f544f4b90bc2aa1bd7c14ebfab3dcd4..396571e939f10d372b10a6d729825664e87880e1 100644 (file)
--- a/raster/rt_core/rt_api.c
+++ b/raster/rt_core/rt_api.c
@@ -225,20 +225,22 @@ rt_util_gdal_resample_alg(const char *algname) {
 GDALDataType
 rt_util_pixtype_to_gdal_datatype(rt_pixtype pt) {
        switch (pt) {
-               case PT_1BB: case PT_2BUI: case PT_4BUI: case PT_8BSI: case PT_8BUI:
+               case PT_1BB:
+               case PT_2BUI:
+               case PT_4BUI:
+               case PT_8BUI:
                        return GDT_Byte;
-               case PT_16BSI: case PT_16BUI:
-                       if (pt == PT_16BSI)
-                               return GDT_Int16;
-                       else
-                               return GDT_UInt16;
-               case PT_32BSI: case PT_32BUI: case PT_32BF:
-                       if (pt == PT_32BSI)
-                               return GDT_Int32;
-                       else if (pt == PT_32BUI)
-                               return GDT_UInt32;
-                       else
-                               return GDT_Float32;
+               case PT_8BSI:
+               case PT_16BSI:
+                       return GDT_Int16;
+               case PT_16BUI:
+                       return GDT_UInt16;
+               case PT_32BSI:
+                       return GDT_Int32;
+               case PT_32BUI:
+                       return GDT_UInt32;
+               case PT_32BF:
+                       return GDT_Float32;
                case PT_64BF:
                        return GDT_Float64;
                default:
@@ -7960,8 +7962,6 @@ rt_raster rt_raster_gdal_warp(
 
        RASTER_DEBUGF(3, "Suggested geotransform: %f, %f, %f, %f, %f, %f",
                _gt[0], _gt[1], _gt[2], _gt[3], _gt[4], _gt[5]);
-       RASTER_DEBUGF(3, "Suggested extent: %f, %f, %f, %f",
-               dst_extent[0], dst_extent[1], dst_extent[2], dst_extent[3]);
 
        /* store extent in easier to use object */
        extent.MinX = dst_extent[0];
@@ -7969,6 +7969,9 @@ rt_raster rt_raster_gdal_warp(
        extent.MaxX = dst_extent[2];
        extent.MaxY = dst_extent[3];
 
+       RASTER_DEBUGF(3, "Suggested extent: %f, %f, %f, %f",
+               extent.MinX, extent.MinY, extent.MaxX, extent.MaxY);
+
        /* user-defined skew */
        if (NULL != skew_x)
                _skew[0] = *skew_x;
@@ -8386,6 +8389,8 @@ rt_raster rt_raster_gdal_warp(
 
        RASTER_DEBUGF(3, "Applied geotransform: %f, %f, %f, %f, %f, %f",
                _gt[0], _gt[1], _gt[2], _gt[3], _gt[4], _gt[5]);
+       RASTER_DEBUGF(3, "Applied extent: %f, %f, %f, %f",
+               extent.MinX, extent.MinY, extent.MaxX, extent.MaxY);
        RASTER_DEBUGF(3, "Raster dimensions (width x height): %d x %d",
                _dim[0], _dim[1]);
 
@@ -9567,12 +9572,14 @@ rt_raster_gdal_rasterize(const unsigned char *wkb,
 
                        /* nodata value */
                        if (_hasnodata[i]) {
+                               RASTER_DEBUGF(4, "Setting NODATA value of band %d to %f", i, _nodata[i]);
                                cplerr = GDALSetRasterNoDataValue(dst_band, _nodata[i]);
                                if (cplerr != CE_None) {
                                        rterror("rt_raster_gdal_rasterize: Unable to set nodata value");
                                        banderr = 1;
                                        break;
                                }
+                               RASTER_DEBUGF(4, "NODATA value set to %f", GDALGetRasterNoDataValue(dst_band, NULL));
                        }
 
                        /* initial value */