[mapserver-commits] r7131 - branches/branch-5-0/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2007-11-30 17:13:28 -0500 (Fri, 30 Nov 2007)
New Revision: 7131

Modified:
   branches/branch-5-0/mapserver/HISTORY.TXT
   branches/branch-5-0/mapserver/mapresample.c
Log:
fix RAWMODE multiband average/bilinear (#2364)

Modified: branches/branch-5-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-0/mapserver/HISTORY.TXT	2007-11-30 22:08:03 UTC (rev 7130)
+++ branches/branch-5-0/mapserver/HISTORY.TXT	2007-11-30 22:13:28 UTC (rev 7131)
@@ -47,7 +47,10 @@
 - mapogr.cpp: Use pooling api to ensure per-thread sharing of connections 
   only (#2408)
 
+- mapresample.c: Fixed support for multi-band data in RAW mode for bilinear
+  and nearest neighbour resamplers (#2364).
 
+
 Version 5.0.0 (2007-09-17)
 --------------------------
 

Modified: branches/branch-5-0/mapserver/mapresample.c
===================================================================
--- branches/branch-5-0/mapserver/mapresample.c	2007-11-30 22:08:03 UTC (rev 7130)
+++ branches/branch-5-0/mapserver/mapresample.c	2007-11-30 22:13:28 UTC (rev 7131)
@@ -597,21 +597,21 @@
                         psDstImage->img.raw_16bit[
                             nDstX + nDstY * psDstImage->width
                             + band*psDstImage->width*psDstImage->height] 
-                            = (short) padfPixelSum[0];
+                            = (short) padfPixelSum[band];
                     }
                     else if( psSrcImage->format->imagemode == MS_IMAGEMODE_FLOAT32)
                     {
                         psDstImage->img.raw_float[
                             nDstX + nDstY * psDstImage->width
                             + band*psDstImage->width*psDstImage->height] 
-                            = (float) padfPixelSum[0];
+                            = (float) padfPixelSum[band];
                     }
                     else if( psSrcImage->format->imagemode == MS_IMAGEMODE_BYTE )
                     {
                         psDstImage->img.raw_byte[
                             nDstX + nDstY * psDstImage->width
                             + band*psDstImage->width*psDstImage->height] 
-                            = (unsigned char) padfPixelSum[0];
+                            = (unsigned char) padfPixelSum[band];
                     }
                 }
             }
@@ -863,21 +863,21 @@
                         psDstImage->img.raw_16bit[
                             nDstX + nDstY * psDstImage->width
                             + band*psDstImage->width*psDstImage->height] 
-                            = (short) padfPixelSum[0];
+                            = (short) padfPixelSum[band];
                     }
                     else if( psSrcImage->format->imagemode == MS_IMAGEMODE_FLOAT32)
                     {
                         psDstImage->img.raw_float[
                             nDstX + nDstY * psDstImage->width
                             + band*psDstImage->width*psDstImage->height] 
-                            = (float) padfPixelSum[0];
+                            = (float) padfPixelSum[band];
                     }
                     else if( psSrcImage->format->imagemode == MS_IMAGEMODE_BYTE )
                     {
                         psDstImage->img.raw_byte[
                             nDstX + nDstY * psDstImage->width
                             + band*psDstImage->width*psDstImage->height] 
-                            = (unsigned char) padfPixelSum[0];
+                            = (unsigned char) padfPixelSum[band];
                     }
                 }
             }