Commit d1ee378566e9b6c3fba3f196a781d595447f05af
2009-08-01T00:30:16
type1: Use size_t variable to pass the string length.
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
diff --git a/ChangeLog b/ChangeLog
index 7dec4a3..377dae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ type1: Use size_t variable to pass the string length.
+
+ * psaux.h: The type of `len' (the argument to pass
+ the buffer size to the function in AFM_ParserRec)
+ is changed to size_t, to match with ANSI C string
+ functions.
+
+ * t1afm.c (t1_get_index): Ditto.
+
+ * test_afm.c (dummy_get_index): Ditto.
+
+ * afmparse.c (afm_parser_read_vals): To call
+ AFM_ParserRec.get_index, the length of token
+ `len' is casted to size_t.
+
+2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
cid: Fix some data types mismatching with their sources.
* src/cid/cidparse.c (cid_parser_new): The types of
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 503eb2b..235ba7f 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -755,7 +755,7 @@ FT_BEGIN_HEADER
FT_Int
(*get_index)( const char* name,
- FT_UInt len,
+ FT_Offset len,
void* user_data );
void* user_data;
diff --git a/src/psaux/afmparse.c b/src/psaux/afmparse.c
index 0f79f72..0a0f249 100644
--- a/src/psaux/afmparse.c
+++ b/src/psaux/afmparse.c
@@ -378,7 +378,7 @@
for ( i = 0; i < n; i++ )
{
- FT_UInt len;
+ FT_Offset len;
AFM_Value val = vals + i;
diff --git a/src/tools/test_afm.c b/src/tools/test_afm.c
index d53cb33..f5f9936 100644
--- a/src/tools/test_afm.c
+++ b/src/tools/test_afm.c
@@ -63,7 +63,7 @@
int
dummy_get_index( const char* name,
- FT_UInt len,
+ FT_Offset len,
void* user_data )
{
if ( len )
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c
index 586bfd6..16dc471 100644
--- a/src/type1/t1afm.c
+++ b/src/type1/t1afm.c
@@ -50,7 +50,7 @@
/* read a glyph name and return the equivalent glyph index */
static FT_Int
t1_get_index( const char* name,
- FT_UInt len,
+ FT_Offset len,
void* user_data )
{
T1_Font type1 = (T1_Font)user_data;