Fix for multiband raster display

mhugent · mhugent · commit 467ee6611a5d · 2010-01-22T10:34:07.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12815 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -4406,7 +4406,7 @@ void QgsRasterLayer::drawMultiBandColor( QPainter * theQPainter, QgsRasterViewPo
   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 @@ void QgsRasterLayer::drawMultiBandColor( QPainter * theQPainter, QgsRasterViewPo
   {
     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 @@ bool QgsRasterImageBuffer::nextScanLine( QRgb** imageScanLine, void** rasterScan
     return false;
   }
 
-  if ( !mCurrentGDALData || ! mCurrentImage )
+  if ( !mCurrentImage && !mCurrentGDALData )
   {
     return false;
   }
@@ -5614,7 +5614,7 @@ bool QgsRasterImageBuffer::nextScanLine( QRgb** imageScanLine, void** rasterScan
 
 bool QgsRasterImageBuffer::createNextPartImage()
 {
-  //draw the last image if mCurrentImage if it exists
+  //draw the last image if mCurrentImage exists
   if ( mCurrentImage )
   {
     if ( mWritingEnabled )

Original file line number	Diff line number	Diff line change
`@@ -4406,7 +4406,7 @@ void QgsRasterLayer::drawMultiBandColor( QPainter * theQPainter, QgsRasterViewPo`
`4406`	`4406`	`QgsRasterImageBuffer greenImageBuffer( myGdalGreenBand, theQPainter, theRasterViewPort, theQgsMapToPixel, &mGeoTransform[0] );`
`4407`	`4407`	`greenImageBuffer.setWritingEnabled( false ); //only draw to redImageBuffer`
`4408`	`4408`	`greenImageBuffer.reset();`
`4409`		`- QgsRasterImageBuffer blueImageBuffer( myGdalGreenBand, theQPainter, theRasterViewPort, theQgsMapToPixel, &mGeoTransform[0] );`
	`4409`	`+ QgsRasterImageBuffer blueImageBuffer( myGdalBlueBand, theQPainter, theRasterViewPort, theQgsMapToPixel, &mGeoTransform[0] );`
`4410`	`4410`	`blueImageBuffer.setWritingEnabled( false ); //only draw to redImageBuffer`
`4411`	`4411`	`blueImageBuffer.reset();`
`4412`	`4412`
`@@ -4415,9 +4415,9 @@ void QgsRasterLayer::drawMultiBandColor( QPainter * theQPainter, QgsRasterViewPo`
`4415`	`4415`	`{`
`4416`	`4416`	`for ( int i = 0; i < theRasterViewPort->drawableAreaXDim; ++i )`
`4417`	`4417`	`{`
`4418`		`- myRedValue = readValue( redImageScanLine, ( GDALDataType )myRedType, i );`
`4419`		`- myGreenValue = readValue( greenImageScanLine, ( GDALDataType )myGreenType, i );`
`4420`		`- myBlueValue = readValue( blueImageScanLine, ( GDALDataType )myBlueType, i );`
	`4418`	`+ myRedValue = readValue( redRasterScanLine, ( GDALDataType )myRedType, i );`
	`4419`	`+ myGreenValue = readValue( greenRasterScanLine, ( GDALDataType )myGreenType, i );`
	`4420`	`+ myBlueValue = readValue( blueRasterScanLine, ( GDALDataType )myBlueType, i );`
`4421`	`4421`
`4422`	`4422`	`if ( mValidNoDataValue && (( fabs( myRedValue - mNoDataValue ) <= TINY_VALUE \|\| myRedValue != myRedValue ) \|\| ( fabs( myGreenValue - mNoDataValue ) <= TINY_VALUE \|\| myGreenValue != myGreenValue ) \|\| ( fabs( myBlueValue - mNoDataValue ) <= TINY_VALUE \|\| myBlueValue != myBlueValue ) ) )`
`4423`	`4423`	`{`
`@@ -5582,7 +5582,7 @@ bool QgsRasterImageBuffer::nextScanLine( QRgb imageScanLine, void rasterScan`
`5582`	`5582`	`return false;`
`5583`	`5583`	`}`
`5584`	`5584`
`5585`		`- if ( !mCurrentGDALData \|\| ! mCurrentImage )`
	`5585`	`+ if ( !mCurrentImage && !mCurrentGDALData )`
`5586`	`5586`	`{`
`5587`	`5587`	`return false;`
`5588`	`5588`	`}`
`@@ -5614,7 +5614,7 @@ bool QgsRasterImageBuffer::nextScanLine( QRgb imageScanLine, void rasterScan`
`5614`	`5614`
`5615`	`5615`	`bool QgsRasterImageBuffer::createNextPartImage()`
`5616`	`5616`	`{`
`5617`		`- //draw the last image if mCurrentImage if it exists`
	`5617`	`+ //draw the last image if mCurrentImage exists`
`5618`	`5618`	`if ( mCurrentImage )`
`5619`	`5619`	`{`
`5620`	`5620`	`if ( mWritingEnabled )`