From f191c1a99a66524f9413dac4f56bd3091a1e3aad Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 1 Jan 2004 08:21:30 +0000 Subject: [PATCH] * src/cff/cffgload.c (cff_decoder_parse_charstrings) [FT_DEBUG_LEVEL_TRACE]: Use `%ld' in FT_TRACE4. : Change type of dx and dy to FT_Pos and remove cast for accessing arguments. --- ChangeLog | 7 +++++++ src/cff/cffgload.c | 16 ++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 656c5ad03..db7daaef6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-12-31 Wolfgang Domröse + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) + [FT_DEBUG_LEVEL_TRACE]: Use `%ld' in FT_TRACE4. + : Change type of dx and dy to FT_Pos and remove + cast for accessing arguments. + 2003-12-31 Werner Lemberg * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Revert previous diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 7b259155b..a44f4e1fa 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -907,7 +907,7 @@ #ifdef FT_DEBUG_LEVEL_TRACE if ( !( val & 0xFFFFL ) ) - FT_TRACE4(( " %d", (FT_Int32)( val >> 16 ) )); + FT_TRACE4(( " %ld", (FT_Int32)( val >> 16 ) )); else FT_TRACE4(( " %.2f", val / 65536.0 )); #endif @@ -1653,11 +1653,11 @@ case cff_op_flex1: { - FT_Pos start_x, start_y; /* record start x, y values for alter */ - /* use */ - FT_Int dx = 0, dy = 0; /* used in horizontal/vertical */ - /* algorithm below */ - FT_Int horizontal, count; + FT_Pos start_x, start_y; /* record start x, y values for */ + /* alter use */ + FT_Fixed dx = 0, dy = 0; /* used in horizontal/vertical */ + /* algorithm below */ + FT_Int horizontal, count; FT_TRACE4(( " flex1" )); @@ -1679,8 +1679,8 @@ /* grab up to the last argument */ for ( count = 5; count > 0; count-- ) { - dx += (FT_Int)args[0]; - dy += (FT_Int)args[1]; + dx += args[0]; + dy += args[1]; args += 2; }