From d0f73034cf5e6c5b7f52ce7d31bd3b3d8cca0d4c Mon Sep 17 00:00:00 2001 From: Mark Crichton Date: Mon, 14 Feb 2000 23:26:01 +0000 Subject: [PATCH] Iain sent me a xpm that didn't load. It used "g" instead of "c" in it's Iain sent me a xpm that didn't load. It used "g" instead of "c" in it's color table. I thought that was borked until I saw Imlib, xv, and Gimp load it up w/o problem... So, fixed that (less than one line fix). HOWEVER, if this is correct, then the gdk XPM loader in gtk+ also has the same problem. Owen, got an opinion on this? Mark --- gdk-pixbuf/ChangeLog | 5 +++++ gdk-pixbuf/io-xpm.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 04e4aaad68..a19b927dfa 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2000-02-14 Mark Crichton + + * gdk-pixbuf/io-xpm.c (xpm_extract_color): Added check for "g" color type. + Imlib/libXpm handle this, but we didn't. + 2000-02-14 Darin Adler * gdk-pixbuf/testpixbuf.c: Remove now-unnecessary cast. diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c index 69a3a4e79e..dcc4a8c30a 100644 --- a/gdk-pixbuf/io-xpm.c +++ b/gdk-pixbuf/io-xpm.c @@ -195,7 +195,7 @@ xpm_extract_color (const gchar *buffer) counter = 0; while (ptr == NULL) { - if (buffer[counter] == 'c') { + if ((buffer[counter] == 'c') || (buffer[counter] == 'g')) { ch = buffer[counter + 1]; if (ch == 0x20 || ch == 0x09) ptr = &buffer[counter + 1];