summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2007-11-20 11:15:12 +0000
committerBastien Nocera <hadess@src.gnome.org>2007-11-20 11:15:12 +0000
commit9e0b0194ed7ded02d3093daaa6da7e7958eb4127 (patch)
treed65b648134be2bea3a0f1adf7156ea326c981bc3
parenta1dcb1ab8121fef602522d61531a98953fe6bee3 (diff)
downloadgtk+-9e0b0194ed7ded02d3093daaa6da7e7958eb4127.tar.gz
Add support for 512x512 Leopard icons, using the ic09 iconType
2007-11-20 Bastien Nocera <hadess@hadess.net> * io-icns.c: (load_resources): Add support for 512x512 Leopard icons, using the ic09 iconType svn path=/trunk/; revision=19009
-rw-r--r--gdk-pixbuf/ChangeLog5
-rw-r--r--gdk-pixbuf/io-icns.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index dee96b8e76..2ed7700092 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,5 +1,10 @@
2007-11-20 Bastien Nocera <hadess@hadess.net>
+ * io-icns.c: (load_resources): Add support for 512x512 Leopard
+ icons, using the ic09 iconType
+
+2007-11-20 Bastien Nocera <hadess@hadess.net>
+
* Makefile.am:
* io-icns.c: Add icns (MacOS X icons) loader, based on work by
Lyonel Vincent <lyonel@ezix.org> (Closes: #395738)
diff --git a/gdk-pixbuf/io-icns.c b/gdk-pixbuf/io-icns.c
index 98ad97dd50..62a8523345 100644
--- a/gdk-pixbuf/io-icns.c
+++ b/gdk-pixbuf/io-icns.c
@@ -88,7 +88,9 @@ load_resources (unsigned size, IN gpointer data, gsize datalen,
switch (size)
{
case 256:
- if (memcmp (header->id, "ic08", 4) == 0) /* 256x256 icon */
+ case 512:
+ if (memcmp (header->id, "ic08", 4) == 0 /* 256x256 icon */
+ || memcmp (header->id, "ic09", 4) == 0) /* 512x512 icon */
{
*picture = (gpointer) (current + sizeof (IcnsBlockHeader));
*plen = blocklen - sizeof (IcnsBlockHeader);