diff options
author | marha <marha@users.sourceforge.net> | 2010-04-12 09:53:17 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-04-12 09:53:17 +0000 |
commit | 29b86f9852b2b7ecc31cdfee56679537e40bc6e2 (patch) | |
tree | 1e6ec8ccf2dbf773260a1953b8e13c49f9b7c5f5 /freetype/src/autofit | |
parent | 529236591df7366479a6fac30b387667678fd1ba (diff) | |
download | vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.tar.gz vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.tar.bz2 vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.zip |
svn merge -r524:HEAD "^/branches/released" .
Diffstat (limited to 'freetype/src/autofit')
-rw-r--r-- | freetype/src/autofit/aflatin.c | 8 | ||||
-rw-r--r-- | freetype/src/autofit/aflatin2.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/freetype/src/autofit/aflatin.c b/freetype/src/autofit/aflatin.c index 394fb9789..e6882d5e7 100644 --- a/freetype/src/autofit/aflatin.c +++ b/freetype/src/autofit/aflatin.c @@ -402,16 +402,16 @@ af_latin_metrics_check_digits( AF_LatinMetrics metrics, FT_Face face ) { - FT_UInt i; - FT_Bool started = 0, same_width = 1; + FT_UInt i; + FT_Bool started = 0, same_width = 1; + FT_Fixed advance, old_advance = 0; /* check whether all ASCII digits have the same advance width; */ /* digit `0' is 0x30 in all supported charmaps */ for ( i = 0x30; i <= 0x39; i++ ) { - FT_UInt glyph_index; - FT_Fixed advance, old_advance = 0; + FT_UInt glyph_index; glyph_index = FT_Get_Char_Index( face, i ); diff --git a/freetype/src/autofit/aflatin2.c b/freetype/src/autofit/aflatin2.c index 5e2ad48c4..5cbeb296b 100644 --- a/freetype/src/autofit/aflatin2.c +++ b/freetype/src/autofit/aflatin2.c @@ -407,16 +407,16 @@ af_latin2_metrics_check_digits( AF_LatinMetrics metrics, FT_Face face ) { - FT_UInt i; - FT_Bool started = 0, same_width = 1; + FT_UInt i; + FT_Bool started = 0, same_width = 1; + FT_Fixed advance, old_advance = 0; /* check whether all ASCII digits have the same advance width; */ /* digit `0' is 0x30 in all supported charmaps */ for ( i = 0x30; i <= 0x39; i++ ) { - FT_UInt glyph_index; - FT_Fixed advance, old_advance; + FT_UInt glyph_index; glyph_index = FT_Get_Char_Index( face, i ); |