gxvalid: Guarantee `nFeatureFlags' size up to 32-bit.

16 years ago · 277733fc8d
parent 3fa528c45d
commit 277733fc8d
3 changed files with 12 additions and 4 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+2009-07-03  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+	gxvalid: Guarantee `nFeatureFlags' size up to 32-bit.
+
+	* src/gxvalid/gxvmort.c (gxv_mort_featurearray_validate):
+	Extend the 3rd argument `nFeatureFlags' to FT_ULong.
+	* src/gxvalid/gxvmort.h: Ditto.
+
 2009-07-03  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>

 	sfnt: Insert explicit cast for LP64 system.
--- a/src/gxvalid/gxvmort.c
+++ b/src/gxvalid/gxvmort.c
@ -85,17 +85,17 @@


  /*
-   * nFeatureFlags is typed to FT_UInt to accept that in
+   * nFeatureFlags is typed to FT_ULong to accept that in
   * mort (typed FT_UShort) and morx (typed FT_ULong).
   */
  FT_LOCAL_DEF( void )
  gxv_mort_featurearray_validate( FT_Bytes       table,
                                  FT_Bytes       limit,
-                                  FT_UInt        nFeatureFlags,
+                                  FT_ULong       nFeatureFlags,
                                  GXV_Validator  valid )
  {
    FT_Bytes  p = table;
-    FT_UInt   i;
+    FT_ULong  i;

    GXV_mort_featureRec  f = GXV_MORT_FEATURE_OFF;

--- a/src/gxvalid/gxvmort.h
+++ b/src/gxvalid/gxvmort.h
@ -54,7 +54,7 @@
  FT_LOCAL( void )
  gxv_mort_featurearray_validate( FT_Bytes       table,
                                  FT_Bytes       limit,
-                                  FT_UInt        nFeatureFlags,
+                                  FT_ULong       nFeatureFlags,
                                  GXV_Validator  valid );

  FT_LOCAL( void )