[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/icons
From:       Christoph Feck <christoph () maxiom ! de>
Date:       2009-11-24 22:41:19
Message-ID: 1259102479.052930.27527.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1053871 by cfeck:

Fix effects on 16/24 bpp images

Patch by Christoph Bartoschek,
see http://reviewboard.kde.org/r/2273/


 M  +6 -1      kiconeffect.cpp  


--- trunk/KDE/kdelibs/kdeui/icons/kiconeffect.cpp #1053870:1053871
@@ -305,8 +305,13 @@
     {
 	if (img.depth() > 8)
         {
-            if(img.format() == QImage::Format_ARGB32_Premultiplied)
+            //Code using data and pixels assumes that the pixels are stored
+            //in 32bit values and that the image is not premultiplied
+            if ((img.format() != QImage::Format_ARGB32) &&
+                (img.format() != QImage::Format_RGB32))
+            {
                 img = img.convertToFormat(QImage::Format_ARGB32);
+            }
             data   = (unsigned int*)img.bits();
 	    pixels = img.width()*img.height();
 	}
[prev in list] [next in list] [prev in thread] [next in thread]