[Xorg-commit] xc/extras/freetype2/src/otlayout otlgsub.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/extras/freetype2/src/otlayout
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/freetype2/src/otlayout

Modified Files:
      Tag: XORG-CURRENT
	otlgsub.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: otlgsub.c
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/src/otlayout/otlgsub.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/otlgsub.c	26 Nov 2003 22:48:26 -0000	1.1.4.1
+++ b/otlgsub.c	23 Feb 2004 21:32:51 -0000	1.1.4.2
@@ -87,7 +87,7 @@
     OTL_Int    index;
     OTL_Bool   subst = 0;
 
-    if ( parser->context_len != 0xFFFF && parser->context_len < 1 )
+    if ( parser->context_len != 0xFFFFU && parser->context_len < 1 )
       goto Exit;
 
     gindex = otl_parser_get_gindex( parser );
@@ -107,7 +107,7 @@
           {
             OTL_Int  delta = OTL_NEXT_SHORT(p);
 
-            gindex = ( gindex + delta ) & 0xFFFF;
+            gindex = ( gindex + delta ) & 0xFFFFU;
             otl_parser_replace_1( parser, gindex );
             subst = 1;
           }
@@ -223,7 +223,7 @@
     OTL_Int    index;
     OTL_Bool   subst = 0;
 
-    if ( context_len != 0xFFFF && context_len < 1 )
+    if ( context_len != 0xFFFFU && context_len < 1 )
       goto Exit;
 
     gindex = otl_parser_get_gindex( parser );
@@ -341,7 +341,7 @@
 
     OTL_GSUB_Alternate  alternate = parser->alternate;
 
-    if ( context_len != 0xFFFF && context_len < 1 )
+    if ( context_len != 0xFFFFU && context_len < 1 )
       goto Exit;
 
     if ( alternate == NULL )