From a7c00b79e04bb205a2fcdab7f94da4793a522e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Suzuki=2C=20Toshiya=20=28=E9=88=B4=E6=9C=A8=E4=BF=8A?=
 =?UTF-8?q?=E5=93=89=29?= <mpsuzuki@hiroshima-u.ac.jp>
Date: Fri, 9 Jan 2009 07:21:16 +0000
Subject: [PATCH] load_flags of FT_Get_Advance(), FT_Get_Advances() and
 backends are declared as FT_UInt32 for 16-bit platforms

---
 ChangeLog                            | 12 ++++++++++++
 include/freetype/ftadvanc.h          |  4 ++--
 include/freetype/internal/ftdriver.h |  2 +-
 src/base/ftadvanc.c                  |  6 +++---
 src/cff/cffdrivr.c                   |  2 +-
 src/truetype/ttdriver.c              |  2 +-
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 55277973c..6ab60841d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/include/freetype/ftadvanc.h b/include/freetype/ftadvanc.h
index 1597f4f0f..5fddf187e 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_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 );
 
 /* */
diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h
index b6e73b661..ffb4de3dd 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_UInt    flags,
+                              FT_UInt32  flags,
                               FT_Fixed*  advances );
 
 
diff --git a/src/base/ftadvanc.c b/src/base/ftadvanc.c
index db975cadd..06b613765 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_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;
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 0c3979529..002c0b458 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_UInt    flags,
+                    FT_UInt32  flags,
                     FT_Fixed*  advances )
   {
     CFF_Face      face = (CFF_Face)ftface;
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index b2430ba54..1307e8d97 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_UInt    flags,
+                   FT_UInt32  flags,
                    FT_Fixed  *advances )
   {
     FT_UInt  nn;