Commit 18914a4f500bc45a1169aff66006e494d25ac59b
2002-05-21T20:57:36
* src/type42/t32drivr.c: removing compiler warnings
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 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
diff --git a/ChangeLog b/ChangeLog
index 26932aa..8908dae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2002-05-21 David Turner <david@freetype.org>
+ * src/type42/t32drivr.c: removing compiler warnings
+
* include/freetype/internal/ftbdf.h, src/base/ftbdf.c,
src/base/descrip.mms, src/base/Jamfile, src/base/rules.mk:
diff --git a/README b/README
index 4aafe1d..3407ffc 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@
is called `libttf'. They are *not* compatible!
- FreeType 2.1.0
+ FreeType 2.1.1
==============
Please read the docs/CHANGES file, it contains IMPORTANT
@@ -22,9 +22,9 @@
Note that the FreeType 2 documentation is now available as a
separate package from our sites. See:
- ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.0.tar.bz2
- ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.0.tar.gz
- ftp://ftp.freetype.org/pub/freetype2/ftdoc210.zip
+ ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.1.tar.bz2
+ ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.1.tar.gz
+ ftp://ftp.freetype.org/pub/freetype2/ftdoc211.zip
Reports
diff --git a/src/type42/t42drivr.c b/src/type42/t42drivr.c
index c4d4315..5e64792 100644
--- a/src/type42/t42drivr.c
+++ b/src/type42/t42drivr.c
@@ -579,17 +579,33 @@
}
- static FT_Byte
+ static FT_UInt
hexval( FT_Byte v )
{
- if ( v >= 'A' && v <= 'F' )
- return v - 'A' + 10;
- if ( v >= 'a' && v <= 'f' )
- return v - 'a' + 10;
- if ( v >= '0' && v <= '9' )
- return v - '0';
-
- return 0;
+ FT_UInt d;
+
+ d = (FT_UInt)( v - 'A' );
+ if ( d < 6 )
+ {
+ d += 10;
+ goto Exit;
+ }
+
+ d = (FT_UInt)( v - 'A' );
+ if ( d < 6 )
+ {
+ d += 10;
+ goto Exit;
+ }
+
+ d = (FT_UInt)( v - '0' );
+ if ( d < 10 )
+ goto Exit;
+
+ d = 0;
+
+ Exit:
+ return d;
}
@@ -681,7 +697,7 @@
goto Fail;
}
- v = 16 * hexval( *cur++ ) + hexval( *cur++ );
+ v = (FT_Byte)( 16 * hexval( *cur++ ) + hexval( *cur++ ) );
string_size++;
}