Paletted raster renderer: replace nodata values in a color table copy before the main loop

mhugent · mhugent · commit b54e90562d8d · 2012-12-21T22:34:45.000+01:00
diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/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 );
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,20 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle con`
`171`	`171`	`return outputBlock;`
`172`	`172`	`}`
`173`	`173`
	`174`	`+ //create copy of color table with nodata values replaced by fully transparent color`
	`175`	`+ QRgb colorTable[mNColors];`
	`176`	`+ for ( int i = 0; i < mNColors; ++i )`
	`177`	`+ {`
	`178`	`+ if ( inputBlock->isNoDataValue( i ) )`
	`179`	`+ {`
	`180`	`+ colorTable[i] = QColor( 0, 0, 0, 0 ).rgba();`
	`181`	`+ }`
	`182`	`+ else`
	`183`	`+ {`
	`184`	`+ colorTable[i] = mColors[i];`
	`185`	`+ }`
	`186`	`+ }`
	`187`	`+`
`174`	`188`	`//use direct data access instead of QgsRasterBlock::setValue`
`175`	`189`	`//because of performance`
`176`	`190`	`unsigned int* outputData = ( unsigned int* )( outputBlock->data() );`
`@@ -179,14 +193,9 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle con`
`179`	`193`	`for ( size_t i = 0; i < rasterSize; ++i )`
`180`	`194`	`{`
`181`	`195`	`int val = ( int ) inputBlock->value( i );`
`182`		`- if ( inputBlock->isNoDataValue( val ) )`
`183`		`- {`
`184`		`- outputBlock->setColor( i, myDefaultColor );`
`185`		`- continue;`
`186`		`- }`
`187`	`196`	`if ( !hasTransparency )`
`188`	`197`	`{`
`189`		`- outputData[i] = mColors[ val ];`
	`198`	`+ outputData[i] = colorTable[ val ];`
`190`	`199`	`}`
`191`	`200`	`else`
`192`	`201`	`{`
`@@ -199,7 +208,7 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle con`
`199`	`208`	`{`
`200`	`209`	`currentOpacity *= alphaBlock->value( i ) / 255.0;`
`201`	`210`	`}`
`202`		`- QColor currentColor = QColor( mColors[val] );`
	`211`	`+ QColor currentColor = QColor( colorTable[val] );`
`203`	`212`	`outputData[i] = qRgba( currentOpacity * currentColor.red(), currentOpacity * currentColor.green(), currentOpacity * currentColor.blue(), currentOpacity * 255 );`
`204`	`213`	`}`
`205`	`214`	`}`