Use ARGB premultiplied format for simple marker, fixed multiplication of alpha channel for images with premultiplied format.

git-svn-id: http://svn.osgeo.org/qgis/trunk@12818 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: wonder

src/core/symbology-ng/qgsmarkersymbollayerv2.cpp

@@ -164,7 +164,7 @@ void QgsSimpleMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& contex
 
   double center = (( double ) imageSize / 2 ) + 0.5; // add 1/2 pixel for proper rounding when the figure's coordinates are added
 
-  mCache = QImage( QSize( imageSize, imageSize ), QImage::Format_ARGB32 );
+  mCache = QImage( QSize( imageSize, imageSize ), QImage::Format_ARGB32_Premultiplied );
   mCache.fill( 0 );
 
   QPainter p;

src/core/symbology-ng/qgssymbollayerv2utils.cpp

@@ -722,20 +722,25 @@ void QgsSymbolLayerV2Utils::multiplyImageOpacity( QImage* image, qreal alpha )
     return;
   }
 
-  //change the alpha component of every pixel
-  int widthIndex = 0;
-  int heightIndex = 0;
-  QRgb* scanLine = 0;
   QRgb myRgb;
+  QImage::Format format = image->format();
+  if ( format != QImage::Format_ARGB32_Premultiplied && format != QImage::Format_ARGB32 )
+  {
+    QgsDebugMsg( "no alpha channel." );
+    return;
+  }
 
-  for ( ; heightIndex < image->height(); ++heightIndex )
+  //change the alpha component of every pixel
+  for ( int heightIndex = 0; heightIndex < image->height(); ++heightIndex )
   {
-    scanLine = ( QRgb* )image->scanLine( heightIndex );
-    widthIndex = 0;
-    for ( ; widthIndex < image->width(); ++widthIndex )
+    QRgb* scanLine = ( QRgb* )image->scanLine( heightIndex );
+    for ( int widthIndex = 0; widthIndex < image->width(); ++widthIndex )
     {
-      myRgb = image->pixel( widthIndex, heightIndex );
-      scanLine[widthIndex] = qRgba( qRed( myRgb ), qGreen( myRgb ), qBlue( myRgb ), qAlpha( myRgb ) * alpha );
+      myRgb = scanLine[widthIndex];
+      if ( format == QImage::Format_ARGB32_Premultiplied )
+        scanLine[widthIndex] = qRgba( alpha * qRed( myRgb ), alpha * qGreen( myRgb ), alpha * qBlue( myRgb ), alpha * qAlpha( myRgb ) );
+      else
+        scanLine[widthIndex] = qRgba( qRed( myRgb ), qGreen( myRgb ), qBlue( myRgb ), alpha * qAlpha( myRgb ) );
     }
   }
 }