Commit b16a942671c80f0cbb2cdca96a4a583dabcdaf73
2009-08-01T00:32:25
cff: Type large constants > 0x7FFF as long for 16-bit systems.
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
diff --git a/ChangeLog b/ChangeLog
index 8036697..35f93c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ cff: Type large constants > 0x7FFF as long for 16-bit systems.
+
+ * src/cff/cffload.c (cff_charset_load): Type large
+ constants > 0x7FFF as long, because normal constants
+ are typed signed integer that is less than 0x8000 on
+ 16-bit systems.
+
+2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
base: Remove an unused variable.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Remove an
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 14d3db7..64d1395 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -851,7 +851,7 @@
/* this constant is given in the CFF specification */
- if ( sid < 65000 )
+ if ( sid < 65000L )
charset->sids[j] = sid;
else
{
@@ -894,16 +894,16 @@
/* check whether the range contains at least one valid glyph; */
/* the constant is given in the CFF specification */
- if ( glyph_sid >= 65000 ) {
+ if ( glyph_sid >= 65000L ) {
FT_ERROR(( "cff_charset_load: invalid SID range\n" ));
error = CFF_Err_Invalid_File_Format;
goto Exit;
}
/* try to rescue some of the SIDs if `nleft' is too large */
- if ( nleft > 65000 - 1 || glyph_sid >= 65000 - nleft ) {
+ if ( nleft > 65000L - 1L || glyph_sid >= 65000L - nleft ) {
FT_ERROR(( "cff_charset_load: invalid SID range trimmed\n" ));
- nleft = 65000 - 1 - glyph_sid;
+ nleft = ( FT_UInt )( 65000L - 1L - glyph_sid );
}
/* Fill in the range of sids -- `nleft + 1' glyphs. */