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

List:       kde-commits
Subject:    branches/work/kdelibs4_snapshot/kdecore
From:       Stephan Kulow <coolo () kde ! org>
Date:       2006-05-09 19:08:41
Message-ID: 1147201721.599905.5487.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 539121 by coolo:

don't crash - KDE4's png are optimized and as such are no
longer fitting the assumption


 M  +5 -2      kiconloader.cpp  


--- branches/work/kdelibs4_snapshot/kdecore/kiconloader.cpp #539120:539121
@@ -817,13 +817,16 @@
 	if ((overlay & K3Icon::ShareOverlay) &&
 	    ((ovl = loadOverlay(theme->shareOverlay(), size)) != 0L))
 	  KIconEffect::overlay(*img, *ovl);
-        if (overlay & K3Icon::HiddenOverlay)
+        if (overlay & K3Icon::HiddenOverlay) 
+        {
+	    *img = img->convertToFormat(QImage::Format_ARGB32);
             for (int y = 0; y < img->height(); y++)
             {
-		quint32 *line = reinterpret_cast<quint32 *>(img->scanLine(y));
+		QRgb* line = reinterpret_cast<QRgb *>(img->scanLine(y));
                 for (int x = 0; x < img->width();  x++)
                     line[x] = (line[x] & 0x00ffffff) | (qMin(0x80, qAlpha(line[x])) << 24);
 	    }
+	}
     }
 
     // Scale the icon and apply effects if necessary
[prev in list] [next in list] [prev in thread] [next in thread]