@@ -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 )
0 commit comments