load_flags of FT_Get_Advance(), FT_Get_Advances() and backends are declared as FT_UInt32 for 16-bit platforms

16 years ago · a7c00b79e0
parent 9b1da084c2
commit a7c00b79e0
6 changed files with 20 additions and 8 deletions
--- a/12
+++ b/12
@ -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): Extend the type of load_flags from FT_UInt to
+	FT_UInt32, to pass 32-bit flags on 16bit platforms.
+	* 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  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>

 	* src/base/ftobjs.c (FT_Done_Library): Issue an error message when
--- 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_UInt    load_flags,
+                  FT_UInt32  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_UInt    load_flags,
+                   FT_UInt32  load_flags,
                   FT_Fixed  *padvances );

 /* */
--- 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_UInt    flags,
+                              FT_UInt32  flags,
                              FT_Fixed*  advances );


--- 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_UInt    flags )
+                           FT_UInt32  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_UInt    flags,
+                  FT_UInt32  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_UInt    flags,
+                   FT_UInt32  flags,
                   FT_Fixed  *padvances )
  {
    FT_Face_GetAdvancesFunc  func;
--- 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_UInt    flags,
+                    FT_UInt32  flags,
                    FT_Fixed*  advances )
  {
    CFF_Face      face = (CFF_Face)ftface;
--- 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_UInt    flags,
+                   FT_UInt32  flags,
                   FT_Fixed  *advances )
  {
    FT_UInt  nn;