Merge lp:~aacid/unity-2d/load_24bit_pixbuf_icons 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

[Gerry Boland (gerboland)]

Looks good, thank you!

review: Approve

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/275/console reported an error when processing this lp:~aacid/unity-2d/load_24bit_pixbuf_icons branch.
Not merging it.

[Gerry Boland (gerboland)]

Test failed with this output:

********* Start testing of GImageUtilsTest *********
Config: Using QTest library 4.8.1, Qt 4.8.1
PASS : GImageUtilsTest::initTestCase()

(process:3931): GLib-GObject-CRITICAL **: /build/buildd/glib2.0-2.32.1/./gobject/gtype.c:2722: You forgot to call g_type_init()

(process:3931): GLib-GObject-CRITICAL **: /build/buildd/glib2.0-2.32.1/./gobject/gtype.c:2722: You forgot to call g_type_init()

(process:3931): GLib-GObject-CRITICAL **: g_type_interface_add_prerequisite: assertion `G_TYPE_IS_INTERFACE (interface_type)' failed

(process:3931): GLib-CRITICAL **: g_once_init_leave: assertion `result != 0' failed

(process:3931): GLib-GObject-CRITICAL **: g_type_add_interface_static: assertion `G_TYPE_IS_INSTANTIATABLE (instance_type)' failed

(process:3931): GLib-CRITICAL **: g_once_init_leave: assertion `result != 0' failed

(process:3931): GLib-GObject-CRITICAL **: g_object_new: assertion `G_TYPE_IS_OBJECT (object_type)' failed
QFATAL : GImageUtilsTest::test24bit() Received signal 11
FAIL! : GImageUtilsTest::test24bit() Received a fatal error.
   Loc: [Unknown file(0)]
Totals: 1 passed, 1 failed, 0 skipped
********* Finished testing of GImageUtilsTest *********
/tmp/buildd/unity-2d-5.10.0+bzr1078ubuntu0+inline/tests/misc/run-with-xvfb.sh: line 19: 3931 Aborted DISPLAY=:$XID $1

Anticipate some configuration needed with Jenkins.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/277/console reported an error when processing this lp:~aacid/unity-2d/load_24bit_pixbuf_icons branch.
Not merging it.

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

1073. By Albert Astals Cid on 2012-04-25

Merge lp:unity-2d

1074. By Albert Astals Cid on 2012-04-30

Merge lp:unity-2d

[Gerry Boland (gerboland)]

Ok, let's try merging again.

review: Approve

=== added file 'libunity-2d-private/tests/gimageutilstest.cpp'
--- libunity-2d-private/tests/gimageutilstest.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/tests/gimageutilstest.cpp	2012-04-30 13:56:20 +0000
@@ -0,0 +1,46 @@
+ /*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QObject>
+#include <unitytestmacro.h>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "gimageutils.h"
+#include <config.h>
+
+class GImageUtilsTest : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void test24bit()
+    {
+        GError *err = NULL;
+        const QString path = unity2dDirectory() + "/libunity-2d-private/tests/verification/24bit.png";
+        const GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path.toLocal8Bit().constData(), &err);
+        QVERIFY(!err);
+        const QImage image = GImageUtils::imageForPixbuf(pixbuf, path);
+        QCOMPARE(image.width(), 32);
+        QCOMPARE(image.height(), 32);
+        QVERIFY(!image.isNull());
+    }
+};
+
+QAPP_TEST_MAIN(GImageUtilsTest)
+
+#include "gimageutilstest.moc"
 
=== added file 'libunity-2d-private/tests/verification/24bit.png'
 Binary files libunity-2d-private/tests/verification/24bit.png	1970-01-01 00:00:00 +0000 and libunity-2d-private/tests/verification/24bit.png	2012-04-30 13:56:20 +0000 differ
=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-04-26 08:16:18 +0000
+++ tests/manual-tests/launcher.txt	2012-04-30 13:56:20 +0000
@@ -148,10 +148,6 @@
 
 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
-----
  * Have the launcher in always shown mode
  * Have the launcher with more items that it can hold in screen (i.e. it is scrollable)
  * Put the mouse in the area of the launcher that makes it autoscroll down (and don't move it for the rest of the test)