From 27fec072e3fc9800f257897fab3a80a54cbf3e96 Mon Sep 17 00:00:00 2001
From: Darin Adler <darin@src.gnome.org>
Date: Fri, 8 Feb 2002 19:08:20 +0000
Subject: [PATCH] Wean this from <ctype.h>.

	* io-xbm.c: (next_int): Wean this from <ctype.h>.
---
 gdk-pixbuf/ChangeLog | 4 ++++
 gdk-pixbuf/io-xbm.c  | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 2aaa9f0004..4b85e60afe 100644
--- 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 c5589bc979..d1a087e447 100644
--- 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++;