Sync trunk.

[reactos.git] / lib / 3rdparty / freetype / src / gxvalid / gxvmorx.c

diff --git a/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c b/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c
index 849d5e9..f8ba5b9 100644 (file)
--- a/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c
+++ b/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c
@@ -4,7 +4,8 @@
 /*                                                                         */
 /*    TrueTypeGX/AAT morx table validation (body).                         */
 /*                                                                         */
-/*  Copyright 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K.,       */
+/*  Copyright 2005, 2008 by                                                */
+/*  suzuki toshiya, Masatake YAMATO, Red Hat K.K.,                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -68,8 +69,8 @@
       FT_ULong  length;
       FT_ULong  coverage;
       FT_ULong  subFeatureFlags;
-      FT_UInt   type;
-      FT_UInt   rest;
+      FT_ULong  type;
+      FT_ULong  rest;
 
 
       GXV_LIMIT_CHECK( 4 + 4 + 4 );
@@ -129,7 +130,7 @@
     gxv_mort_featurearray_validate( p, limit, nFeatureFlags, valid );
     p += valid->subtable_length;
 
-    if ( nSubtables >= 0x10000 )
+    if ( nSubtables >= 0x10000L )
       FT_INVALID_DATA;
 
     gxv_morx_subtables_validate( p, table + chainLength,