Wean this from <ctype.h>.

	* io-xbm.c: (next_int): Wean this from <ctype.h>.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 2aaa9f0004425ee237d8048ed3d051b8f87e5ade..4b85e60afe3189028f5befe864be1b82fb6005a1 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-08  Darin Adler  <darin@bentspoon.com>
+
+       * io-xbm.c: (next_int): Wean this from <ctype.h>.
+
 2002-02-01  Matthias Clasen  <matthiasc@poet.de>
 
        * Makefile.am: Build the tga loader as a static library. (#70157)

diff --git a/gdk-pixbuf/io-xbm.c b/gdk-pixbuf/io-xbm.c
index c5589bc97923c2c00deaa191380532f437d80b4b..d1a087e447a89f9abf59e0c22494f72ab3ccf807 100644 (file)
--- a/gdk-pixbuf/io-xbm.c
+++ b/gdk-pixbuf/io-xbm.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <errno.h>
 #include "gdk-pixbuf-private.h"
 #include "gdk-pixbuf-io.h"
@@ -129,8 +128,8 @@ next_int (FILE *fstream)
                } else {
                        /* trim high bits, check type and accumulate */
                        ch &= 0xff;
-                       if (isascii (ch) && isxdigit (ch)) {
-                               value = (value << 4) + hex_table[ch];
+                       if (g_ascii_isxdigit (ch)) {
+                               value = (value << 4) + g_ascii_xdigit_value (ch);
                                gotone++;
                        } else if ((hex_table[ch]) < 0 && gotone) {
                                done++;