Commit 0c5789f9c20fb26272ced929a613679dfa5634b8
2012-03-22T07:05:40
[bdflib] Remove redundant macro. * src/bdf/bdflib.c (isdigok): Remove and replace with sbitset, which is exactly the same.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
diff --git a/ChangeLog b/ChangeLog
index 0e2996b..5155abb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-22 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [bdflib] Remove redundant macro.
+
+ * src/bdf/bdflib.c (isdigok): Remove and replace with sbitset, which
+ is exactly the same.
+
2012-03-20 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
[configure] fix Savannah bug #35644.
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index b12b034..ed08a6e 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -842,9 +842,6 @@
};
-#define isdigok( m, d ) (m[(unsigned char)(d) >> 3] & ( 1 << ( (d) & 7 ) ) )
-
-
/* Routine to convert an ASCII string into an unsigned long integer. */
static unsigned long
_bdf_atoul( char* s,
@@ -882,7 +879,7 @@
s += 2;
}
- for ( v = 0; isdigok( dmap, *s ); s++ )
+ for ( v = 0; sbitset( dmap, *s ); s++ )
v = v * base + a2i[(int)*s];
if ( end != 0 )
@@ -937,7 +934,7 @@
s += 2;
}
- for ( v = 0; isdigok( dmap, *s ); s++ )
+ for ( v = 0; sbitset( dmap, *s ); s++ )
v = v * base + a2i[(int)*s];
if ( end != 0 )
@@ -992,7 +989,7 @@
s += 2;
}
- for ( v = 0; isdigok( dmap, *s ); s++ )
+ for ( v = 0; sbitset( dmap, *s ); s++ )
v = (short)( v * base + a2i[(int)*s] );
if ( end != 0 )
@@ -1747,7 +1744,7 @@
for ( i = 0; i < nibbles; i++ )
{
c = line[i];
- if ( !isdigok( hdigits, c ) )
+ if ( !sbitset( hdigits, c ) )
break;
*bp = (FT_Byte)( ( *bp << 4 ) + a2i[c] );
if ( i + 1 < nibbles && ( i & 1 ) )
@@ -1771,7 +1768,7 @@
/* If any line has extra columns, indicate they have been removed. */
if ( i == nibbles &&
- isdigok( hdigits, line[nibbles] ) &&
+ sbitset( hdigits, line[nibbles] ) &&
!( p->flags & _BDF_GLYPH_WIDTH_CHECK ) )
{
FT_TRACE2(( "_bdf_parse_glyphs: " ACMSG14, glyph->encoding ));