Skip to content
Permalink
Browse files
Paletted raster renderer: replace nodata values in a color table copy…
… before the main loop
  • Loading branch information
mhugent committed Dec 21, 2012
1 parent 38232a0 commit b54e90562d8d966717ee8b6ff1447568d6b2dbea
Showing with 16 additions and 7 deletions.
  1. +16 −7 src/core/raster/qgspalettedrasterrenderer.cpp
@@ -171,6 +171,20 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle con
return outputBlock;
}

//create copy of color table with nodata values replaced by fully transparent color
QRgb colorTable[mNColors];
for ( int i = 0; i < mNColors; ++i )
{
if ( inputBlock->isNoDataValue( i ) )
{
colorTable[i] = QColor( 0, 0, 0, 0 ).rgba();
}
else
{
colorTable[i] = mColors[i];
}
}

//use direct data access instead of QgsRasterBlock::setValue
//because of performance
unsigned int* outputData = ( unsigned int* )( outputBlock->data() );
@@ -179,14 +193,9 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle con
for ( size_t i = 0; i < rasterSize; ++i )
{
int val = ( int ) inputBlock->value( i );
if ( inputBlock->isNoDataValue( val ) )
{
outputBlock->setColor( i, myDefaultColor );
continue;
}
if ( !hasTransparency )
{
outputData[i] = mColors[ val ];
outputData[i] = colorTable[ val ];
}
else
{
@@ -199,7 +208,7 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle con
{
currentOpacity *= alphaBlock->value( i ) / 255.0;
}
QColor currentColor = QColor( mColors[val] );
QColor currentColor = QColor( colorTable[val] );
outputData[i] = qRgba( currentOpacity * currentColor.red(), currentOpacity * currentColor.green(), currentOpacity * currentColor.blue(), currentOpacity * 255 );
}
}

0 comments on commit b54e905

Please sign in to comment.