diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-07-03 18:01:31 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-07-03 18:01:31 +0900 |
| commit | daebaaa81509da2141af694a8999e93d4bb39fff (patch) | |
| tree | faf1cdb9b162f0a2daec26a1ecabec8c8b27435d | |
| parent | 374066a0b8d7ba50ba8862b46f8573fe1988c959 (diff) | |
| download | freetype2-daebaaa81509da2141af694a8999e93d4bb39fff.tar.gz | |
pcf: Fix some data types mismatching with their sources.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/pcf/pcfread.c | 8 |
2 files changed, 12 insertions, 4 deletions
@@ -1,5 +1,13 @@ 2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + pcf: Fix some data types mismatching with their sources. + + * src/pcf/pcfread.c (pcf_seek_to_table_type, + pcf_has_table_type): The type of 3rd argument + `ntables' is matched with PCF_Toc->count. + +2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + otvalid: Truncate the glyph index to 16-bit. * src/otvalid/otvalid.c (otv_validate): Checks diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 476ffbd53..4ec4db895 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -289,13 +289,13 @@ THE SOFTWARE. static FT_Error pcf_seek_to_table_type( FT_Stream stream, PCF_Table tables, - FT_Int ntables, + FT_ULong ntables, /* same as PCF_Toc->count */ FT_ULong type, FT_ULong *aformat, FT_ULong *asize ) { FT_Error error = PCF_Err_Invalid_File_Format; - FT_Int i; + FT_ULong i; for ( i = 0; i < ntables; i++ ) @@ -327,10 +327,10 @@ THE SOFTWARE. static FT_Bool pcf_has_table_type( PCF_Table tables, - FT_Int ntables, + FT_ULong ntables, /* same as PCF_Toc->count */ FT_ULong type ) { - FT_Int i; + FT_ULong i; for ( i = 0; i < ntables; i++ ) |