Skip to content

Commit 467ee66

Browse files
author
mhugent
committedJan 22, 2010
Fix for multiband raster display
git-svn-id: http://svn.osgeo.org/qgis/trunk@12815 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 882e7e8 commit 467ee66

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed
 

‎src/core/raster/qgsrasterlayer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4406,7 +4406,7 @@ void QgsRasterLayer::drawMultiBandColor( QPainter * theQPainter, QgsRasterViewPo
44064406
QgsRasterImageBuffer greenImageBuffer( myGdalGreenBand, theQPainter, theRasterViewPort, theQgsMapToPixel, &mGeoTransform[0] );
44074407
greenImageBuffer.setWritingEnabled( false ); //only draw to redImageBuffer
44084408
greenImageBuffer.reset();
4409-
QgsRasterImageBuffer blueImageBuffer( myGdalGreenBand, theQPainter, theRasterViewPort, theQgsMapToPixel, &mGeoTransform[0] );
4409+
QgsRasterImageBuffer blueImageBuffer( myGdalBlueBand, theQPainter, theRasterViewPort, theQgsMapToPixel, &mGeoTransform[0] );
44104410
blueImageBuffer.setWritingEnabled( false ); //only draw to redImageBuffer
44114411
blueImageBuffer.reset();
44124412

@@ -4415,9 +4415,9 @@ void QgsRasterLayer::drawMultiBandColor( QPainter * theQPainter, QgsRasterViewPo
44154415
{
44164416
for ( int i = 0; i < theRasterViewPort->drawableAreaXDim; ++i )
44174417
{
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 );
44214421

44224422
if ( mValidNoDataValue && (( fabs( myRedValue - mNoDataValue ) <= TINY_VALUE || myRedValue != myRedValue ) || ( fabs( myGreenValue - mNoDataValue ) <= TINY_VALUE || myGreenValue != myGreenValue ) || ( fabs( myBlueValue - mNoDataValue ) <= TINY_VALUE || myBlueValue != myBlueValue ) ) )
44234423
{
@@ -5582,7 +5582,7 @@ bool QgsRasterImageBuffer::nextScanLine( QRgb** imageScanLine, void** rasterScan
55825582
return false;
55835583
}
55845584

5585-
if ( !mCurrentGDALData || ! mCurrentImage )
5585+
if ( !mCurrentImage && !mCurrentGDALData )
55865586
{
55875587
return false;
55885588
}
@@ -5614,7 +5614,7 @@ bool QgsRasterImageBuffer::nextScanLine( QRgb** imageScanLine, void** rasterScan
56145614

56155615
bool QgsRasterImageBuffer::createNextPartImage()
56165616
{
5617-
//draw the last image if mCurrentImage if it exists
5617+
//draw the last image if mCurrentImage exists
56185618
if ( mCurrentImage )
56195619
{
56205620
if ( mWritingEnabled )

0 commit comments

Comments
 (0)
Please sign in to comment.