diff options
| author | Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> | 2009-01-09 11:11:53 +0000 |
|---|---|---|
| committer | Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> | 2009-01-09 11:11:53 +0000 |
| commit | 759c07d149cb97f9cb3233e291339b98194e3585 (patch) | |
| tree | 9a35dd13ac834f5e5f056557330aaa8f3e1de389 | |
| parent | 68e16e010534bbb32e29d719864fbedde5c0a2a1 (diff) | |
| download | freetype2-759c07d149cb97f9cb3233e291339b98194e3585.tar.gz | |
load_flags of FT_Get_Advance(), FT_Get_Advances() and backends are declared as FT_Int32 to match the flags of FT_Load_Glyph()
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | include/freetype/ftadvanc.h | 4 | ||||
| -rw-r--r-- | include/freetype/internal/ftdriver.h | 2 | ||||
| -rw-r--r-- | src/base/ftadvanc.c | 6 | ||||
| -rw-r--r-- | src/cff/cffdrivr.c | 2 | ||||
| -rw-r--r-- | src/truetype/ttdriver.c | 2 |
6 files changed, 20 insertions, 8 deletions
@@ -1,3 +1,15 @@ +2009-01-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + + * src/base/ftadvanc.c (_ft_face_scale_advances, FT_Get_Advance, + FT_Get_Advances): Change the type of load_flags from FT_UInt32 to + FT_Int32, to match with the flags for FT_Load_Glyph(). + * src/cff/cffdrivr.c (cff_get_advances): Ditto. + * src/truetype/ttdriver.c (tt_get_advances): Ditto. + * include/freetype/ftadvanc.h (FT_Get_Advance, FT_Get_Advances): + Ditto. + * include/freetype/internal/ftdriver.h (FT_Face_GetAdvancesFunc): + Ditto. + 2009-01-09 Daniel Zimmermann <netzimme@aol.com> * src/gxvalid/gxvmort.c (gxv_mort_feature_validate): Fix wrong diff --git a/include/freetype/ftadvanc.h b/include/freetype/ftadvanc.h index 5fddf187e..b2451bec4 100644 --- a/include/freetype/ftadvanc.h +++ b/include/freetype/ftadvanc.h @@ -116,7 +116,7 @@ FT_BEGIN_HEADER FT_EXPORT( FT_Error ) FT_Get_Advance( FT_Face face, FT_UInt gindex, - FT_UInt32 load_flags, + FT_Int32 load_flags, FT_Fixed *padvance ); @@ -165,7 +165,7 @@ FT_BEGIN_HEADER FT_Get_Advances( FT_Face face, FT_UInt start, FT_UInt count, - FT_UInt32 load_flags, + FT_Int32 load_flags, FT_Fixed *padvances ); /* */ diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h index ffb4de3dd..854abad08 100644 --- a/include/freetype/internal/ftdriver.h +++ b/include/freetype/internal/ftdriver.h @@ -108,7 +108,7 @@ FT_BEGIN_HEADER (*FT_Face_GetAdvancesFunc)( FT_Face face, FT_UInt first, FT_UInt count, - FT_UInt32 flags, + FT_Int32 flags, FT_Fixed* advances ); diff --git a/src/base/ftadvanc.c b/src/base/ftadvanc.c index 06b613765..2a30829f2 100644 --- a/src/base/ftadvanc.c +++ b/src/base/ftadvanc.c @@ -25,7 +25,7 @@ _ft_face_scale_advances( FT_Face face, FT_Fixed* advances, FT_UInt count, - FT_UInt32 flags ) + FT_Int32 flags ) { FT_Fixed scale; FT_UInt nn; @@ -69,7 +69,7 @@ FT_EXPORT_DEF( FT_Error ) FT_Get_Advance( FT_Face face, FT_UInt gindex, - FT_UInt32 flags, + FT_Int32 flags, FT_Fixed *padvance ) { FT_Face_GetAdvancesFunc func; @@ -105,7 +105,7 @@ FT_Get_Advances( FT_Face face, FT_UInt start, FT_UInt count, - FT_UInt32 flags, + FT_Int32 flags, FT_Fixed *padvances ) { FT_Face_GetAdvancesFunc func; diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index 002c0b458..68b866afb 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -191,7 +191,7 @@ cff_get_advances( FT_Face ftface, FT_UInt start, FT_UInt count, - FT_UInt32 flags, + FT_Int32 flags, FT_Fixed* advances ) { CFF_Face face = (CFF_Face)ftface; diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index 1307e8d97..42feb05ed 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -129,7 +129,7 @@ tt_get_advances( FT_Face ttface, FT_UInt start, FT_UInt count, - FT_UInt32 flags, + FT_Int32 flags, FT_Fixed *advances ) { FT_UInt nn; |