Merge lp:~aacid/unity-2d/load_24bit_pixbuf_icons_2 into lp:unity-2d

[Albert Astals Cid]

[lib] Support 24 bit pixbuf to QImage conversion (e.g. for kmag icon in Launcher)

Support 24 bit pixbuf to QImage conversion (e.g. for kmag icon)
UNBLOCK

[lp:~aacid/unity-2d/load_24bit_pixbuf_icons_2]

1079. By Albert Astals Cid on 2012-04-24

Merge lp:unity-2d

1080. By Albert Astals Cid on 2012-04-24

fix whitespace

=== modified file 'libunity-2d-private/src/gimageutils.cpp'
--- libunity-2d-private/src/gimageutils.cpp	2011-08-01 10:08:29 +0000
+++ libunity-2d-private/src/gimageutils.cpp	2012-04-24 15:51:19 +0000
@@ -66,16 +66,29 @@
         return QImage();
     }
 
-    return imageForPixbuf(pixbuf.data());
+    return imageForPixbuf(pixbuf.data(), name);
 }
 
-QImage imageForPixbuf(const GdkPixbuf* pixbuf)
+QImage imageForPixbuf(const GdkPixbuf* pixbuf, const QString &name)
 {
-    QImage image(gdk_pixbuf_get_pixels(pixbuf),
+    QImage image;
+    if (gdk_pixbuf_get_n_channels(pixbuf) == 3 && gdk_pixbuf_get_bits_per_sample(pixbuf) == 8 && !gdk_pixbuf_get_has_alpha(pixbuf)) {
+        image = QImage(gdk_pixbuf_get_pixels(pixbuf),
+                       gdk_pixbuf_get_width(pixbuf),
+                       gdk_pixbuf_get_height(pixbuf),
+                       gdk_pixbuf_get_rowstride(pixbuf),
+                       QImage::QImage::Format_RGB888);
+        image = image.convertToFormat(QImage::Format_ARGB32);
+    } else {
+        if (gdk_pixbuf_get_n_channels(pixbuf) != 4 || gdk_pixbuf_get_bits_per_sample(pixbuf) != 8 || !gdk_pixbuf_get_has_alpha(pixbuf)) {
+            UQ_WARNING << "Pixbuf is not in the expected format. Trying to load it anyway, will most likely fail" << name;
+        }
+        image = QImage(gdk_pixbuf_get_pixels(pixbuf),
                    gdk_pixbuf_get_width(pixbuf),
                    gdk_pixbuf_get_height(pixbuf),
                    gdk_pixbuf_get_rowstride(pixbuf),
                    QImage::Format_ARGB32);
+    }
 
 #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
     /* ABGR → ARGB */

=== modified file 'libunity-2d-private/src/gimageutils.h'
--- libunity-2d-private/src/gimageutils.h	2011-08-01 10:01:01 +0000
+++ libunity-2d-private/src/gimageutils.h	2012-04-24 15:51:19 +0000
@@ -39,7 +39,8 @@
 
 QImage imageForIconString(const QString& name, int size, struct _GtkIconTheme* theme = 0);
 
-QImage imageForPixbuf(const struct _GdkPixbuf* pixbuf);
+/// The @param name is only used for debugging purposes
+QImage imageForPixbuf(const struct _GdkPixbuf* pixbuf, const QString& name);
 
 } // namespace
 

=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-04-23 13:13:50 +0000
+++ tests/manual-tests/launcher.txt	2012-04-24 15:51:19 +0000
@@ -148,3 +148,7 @@
 
 Verify that the progress bar appears and that the filler looks correctly centered inside the bar
 ----
+ * Launch an application whose icon uses 24 bit per pixel instead of 32 (e.g. kmag in precise)
+
+Verify that the icon shows correctly in the launcher
+----