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];