Fix for #3739 - wms transparency not working when set from layer properties

timlinux · timlinux · commit 5657546e6594 · 2011-04-15T12:27:19.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15703 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -3648,7 +3648,8 @@ void QgsRasterLayer::drawSingleBandColorData( QPainter * theQPainter, QgsRasterV
       for ( int i = 0; i < theRasterViewPort->drawableAreaXDim; ++i )
       {
         QRgb c( *p++ );
-        imageScanLine[ i ] = qRgba( qRed( c ), qGreen( c ), qBlue( c ), mTransparencyLevel );
+
+        imageScanLine[ i ] = qRgba( qRed( c ), qGreen( c ), qBlue( c ), qAlpha( c )  * mTransparencyLevel  / 255 );
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -3648,7 +3648,8 @@ void QgsRasterLayer::drawSingleBandColorData( QPainter * theQPainter, QgsRasterV`
`3648`	`3648`	`for ( int i = 0; i < theRasterViewPort->drawableAreaXDim; ++i )`
`3649`	`3649`	`{`
`3650`	`3650`	`QRgb c( *p++ );`
`3651`		`- imageScanLine[ i ] = qRgba( qRed( c ), qGreen( c ), qBlue( c ), mTransparencyLevel );`
	`3651`	`+`
	`3652`	`+ imageScanLine[ i ] = qRgba( qRed( c ), qGreen( c ), qBlue( c ), qAlpha( c ) * mTransparencyLevel / 255 );`
`3652`	`3653`	`}`
`3653`	`3654`	`}`
`3654`	`3655`	`}`