Fix for transparent values in singleband gray renderer

mhugent · mhugent · commit 6a7ab642e90d · 2012-06-25T09:45:14.000+02:00
diff --git a/src/core/raster/qgssinglebandgrayrenderer.cpp b/src/core/raster/qgssinglebandgrayrenderer.cpp
@@ -122,6 +122,17 @@ void QgsSingleBandGrayRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
       {
         grayVal = readValue( rasterData, rasterType, currentRasterPos );
 
+        //alpha
+        currentAlpha = mOpacity;
+        if ( mRasterTransparency )
+        {
+          currentAlpha = mRasterTransparency->alphaValue( grayVal, mOpacity * 255 ) / 255.0;
+        }
+        if ( mAlphaBand > 0 )
+        {
+          currentAlpha *= ( readValue( alphaData, alphaType, currentRasterPos ) / 255.0 );
+        }
+
         if ( mContrastEnhancement )
         {
           if ( !mContrastEnhancement->isValueInDisplayableRange( grayVal ) )
@@ -138,17 +149,6 @@ void QgsSingleBandGrayRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
           grayVal = 255 - grayVal;
         }
 
-        //alpha
-        currentAlpha = mOpacity;
-        if ( mRasterTransparency )
-        {
-          currentAlpha = mRasterTransparency->alphaValue( grayVal, mOpacity * 255 ) / 255.0;
-        }
-        if ( mAlphaBand > 0 )
-        {
-          currentAlpha *= ( readValue( alphaData, alphaType, currentRasterPos ) / 255.0 );
-        }
-
         if ( doubleNear( currentAlpha, 255 ) )
         {
           imageScanLine[j] = qRgba( grayVal, grayVal, grayVal, 255 );
