[QGIS Commit] r12815 - trunk/qgis/src/core/raster

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-01-22 05:34:07 -0500 (Fri, 22 Jan 2010)
New Revision: 12815

Modified:
   trunk/qgis/src/core/raster/qgsrasterlayer.cpp
Log:
Fix for multiband raster display

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2010-01-21 20:17:29 UTC (rev 12814)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2010-01-22 10:34:07 UTC (rev 12815)
@@ -4406,7 +4406,7 @@
   QgsRasterImageBuffer greenImageBuffer( myGdalGreenBand, theQPainter, theRasterViewPort, theQgsMapToPixel, &mGeoTransform[0] );
   greenImageBuffer.setWritingEnabled( false ); //only draw to redImageBuffer
   greenImageBuffer.reset();
-  QgsRasterImageBuffer blueImageBuffer( myGdalGreenBand, theQPainter, theRasterViewPort, theQgsMapToPixel, &mGeoTransform[0] );
+  QgsRasterImageBuffer blueImageBuffer( myGdalBlueBand, theQPainter, theRasterViewPort, theQgsMapToPixel, &mGeoTransform[0] );
   blueImageBuffer.setWritingEnabled( false ); //only draw to redImageBuffer
   blueImageBuffer.reset();
 
@@ -4415,9 +4415,9 @@
   {
     for ( int i = 0; i < theRasterViewPort->drawableAreaXDim; ++i )
     {
-      myRedValue   = readValue( redImageScanLine, ( GDALDataType )myRedType, i );
-      myGreenValue = readValue( greenImageScanLine, ( GDALDataType )myGreenType, i );
-      myBlueValue  = readValue( blueImageScanLine, ( GDALDataType )myBlueType, i );
+      myRedValue   = readValue( redRasterScanLine, ( GDALDataType )myRedType, i );
+      myGreenValue = readValue( greenRasterScanLine, ( GDALDataType )myGreenType, i );
+      myBlueValue  = readValue( blueRasterScanLine, ( GDALDataType )myBlueType, i );
 
       if ( mValidNoDataValue && (( fabs( myRedValue - mNoDataValue ) <= TINY_VALUE || myRedValue != myRedValue ) || ( fabs( myGreenValue - mNoDataValue ) <= TINY_VALUE || myGreenValue != myGreenValue ) || ( fabs( myBlueValue - mNoDataValue ) <= TINY_VALUE || myBlueValue != myBlueValue ) ) )
       {
@@ -5582,7 +5582,7 @@
     return false;
   }
 
-  if ( !mCurrentGDALData || ! mCurrentImage )
+  if ( !mCurrentImage && !mCurrentGDALData )
   {
     return false;
   }
@@ -5614,7 +5614,7 @@
 
 bool QgsRasterImageBuffer::createNextPartImage()
 {
-  //draw the last image if mCurrentImage if it exists
+  //draw the last image if mCurrentImage exists
   if ( mCurrentImage )
   {
     if ( mWritingEnabled )