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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/icons
From:       Alexis Ménard <menard () kde ! org>
Date:       2009-01-19 12:17:41
Message-ID: 1232367461.988026.30464.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 913432 by menard:

Fix a crash on windows since the paintEngine on Windows return 0. Same check like we \
do in semiTransparent(QImage &img)

PS : refactor tab to spaces.

 M  +12 -12    kiconeffect.cpp  


--- trunk/KDE/kdelibs/kdeui/icons/kiconeffect.cpp #913431:913432
@@ -582,29 +582,29 @@
 
 void KIconEffect::semiTransparent(QPixmap &pix)
 {
-    if (QApplication::desktop()->paintEngine()->hasFeature(QPaintEngine::Antialiasing))
 +    if (QApplication::desktop()->paintEngine() && \
QApplication::desktop()->paintEngine()->hasFeature(QPaintEngine::Antialiasing))  {
-	QImage img=pix.toImage();
-	semiTransparent(img);
-	pix = QPixmap::fromImage(img);
-	return;
+        QImage img=pix.toImage();
+        semiTransparent(img);
+        pix = QPixmap::fromImage(img);
+        return;
     }
 
     QImage img;
     if (!pix.mask().isNull())
-	img = pix.mask().toImage();
+      img = pix.mask().toImage();
     else
     {
-	img = QImage(pix.size(), QImage::Format_Mono);
-	img.fill(1);
+        img = QImage(pix.size(), QImage::Format_Mono);
+        img.fill(1);
     }
 
     for (int y=0; y<img.height(); y++)
     {
-	QRgb* line = (QRgb*)img.scanLine(y);
-	QRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa;
-	for (int x=0; x<(img.width()+31)/32; x++)
-	    line[x] &= pattern;
+        QRgb* line = (QRgb*)img.scanLine(y);
+        QRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa;
+        for (int x=0; x<(img.width()+31)/32; x++)
+            line[x] &= pattern;
     }
     QBitmap mask;
     mask = QBitmap::fromImage(img);


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