pcf: Fix some data types mismatching with their sources.

16 years ago · daebaaa815
parent 374066a0b8
commit daebaaa815
2 changed files with 12 additions and 4 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+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.
--- 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++ )