Optimization in writing raster values in paletted raster renderer

mhugent · mhugent · commit 2da5cc95b756 · 2012-12-07T22:01:02.000+01:00
diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp
@@ -146,6 +146,8 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle  con
     return outputBlock;
   }
 
+  unsigned int* outputData = ( unsigned int* )( outputBlock->data() );
+
   for ( size_t i = 0; i < ( size_t )width*height; i++ )
   {
     int val = ( int ) inputBlock->value( i );
@@ -156,14 +158,7 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle  con
     }
     if ( !hasTransparency )
     {
-      if ( val < 0 || val > mNColors )
-      {
-        outputBlock->setColor( i, myDefaultColor );
-      }
-      else
-      {
-        outputBlock->setColor( i, mColors[ val ].rgba() );
-      }
+      outputData[i] = mColors[ val ].rgba();
     }
     else
     {
@@ -177,8 +172,7 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle  con
         currentOpacity *=  alphaBlock->value( i ) / 255.0;
       }
       QColor& currentColor = mColors[val];
-
-      outputBlock->setColor( i, qRgba( currentOpacity * currentColor.red(), currentOpacity * currentColor.green(), currentOpacity * currentColor.blue(), currentOpacity * 255 ) );
+      outputData[i] = qRgba( currentOpacity * currentColor.red(), currentOpacity * currentColor.green(), currentOpacity * currentColor.blue(), currentOpacity * 255 );
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,8 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle con`
`146`	`146`	`return outputBlock;`
`147`	`147`	`}`
`148`	`148`
	`149`	`+ unsigned int* outputData = ( unsigned int* )( outputBlock->data() );`
	`150`	`+`
`149`	`151`	`for ( size_t i = 0; i < ( size_t )width*height; i++ )`
`150`	`152`	`{`
`151`	`153`	`int val = ( int ) inputBlock->value( i );`
`@@ -156,14 +158,7 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle con`
`156`	`158`	`}`
`157`	`159`	`if ( !hasTransparency )`
`158`	`160`	`{`
`159`		`- if ( val < 0 \|\| val > mNColors )`
`160`		`- {`
`161`		`- outputBlock->setColor( i, myDefaultColor );`
`162`		`- }`
`163`		`- else`
`164`		`- {`
`165`		`- outputBlock->setColor( i, mColors[ val ].rgba() );`
`166`		`- }`
	`161`	`+ outputData[i] = mColors[ val ].rgba();`
`167`	`162`	`}`
`168`	`163`	`else`
`169`	`164`	`{`
`@@ -177,8 +172,7 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle con`
`177`	`172`	`currentOpacity *= alphaBlock->value( i ) / 255.0;`
`178`	`173`	`}`
`179`	`174`	`QColor& currentColor = mColors[val];`
`180`		`-`
`181`		`- outputBlock->setColor( i, qRgba( currentOpacity * currentColor.red(), currentOpacity * currentColor.green(), currentOpacity * currentColor.blue(), currentOpacity * 255 ) );`
	`175`	`+ outputData[i] = qRgba( currentOpacity * currentColor.red(), currentOpacity * currentColor.green(), currentOpacity * currentColor.blue(), currentOpacity * 255 );`
`182`	`176`	`}`
`183`	`177`	`}`
`184`	`178`