Commit a7c00b79e04bb205a2fcdab7f94da4793a522e3b
2009-01-09T07:21:16
load_flags of FT_Get_Advance(), FT_Get_Advances() and backends are declared as FT_UInt32 for 16-bit platforms
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114
diff --git a/ChangeLog b/ChangeLog
index 5527797..6ab6084 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
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
FT_Done_Face() cannot free all faces. If the list of the opened
faces includes broken face which FT_Done_Face() cannot free,
diff --git a/include/freetype/ftadvanc.h b/include/freetype/ftadvanc.h
index 1597f4f..5fddf18 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 b6e73b6..ffb4de3 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 db975ca..06b6137 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 0c39795..002c0b4 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 b2430ba..1307e8d 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;