Update bundled freetype to 2.6.1

third_party/freetype/src/psaux/psconv.c

 /***************************************************************************/
 /*                                                                         */
 /*  psconv.c                                                               */
 /*                                                                         */
 /*    Some convenience conversions (body).                                 */
 /*                                                                         */
-/*  Copyright 2006, 2008, 2009, 2012-2013 by                               */
+/*  Copyright 2006-2015 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
 /*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
 /*  this file you indicate that you have read the license and              */
 /*  understand and accept it fully.                                        */
 /*                                                                         */
 /***************************************************************************/
 
@@ skipping 99 matching lines @@
     c_limit   = (FT_Char)( 0x7FFFFFFFL % base );
 
     for ( ; p < limit; p++ )
     {
       FT_Char  c;
 
 
       if ( IS_PS_SPACE( *p ) || *p OP 0x80 )
         break;
 
-      c = ft_char_table[*p & 0x7f];
+      c = ft_char_table[*p & 0x7F];
 
       if ( c < 0 || c >= base )
         break;
 
       if ( num > num_limit || ( num == num_limit && c > c_limit ) )
         have_overflow = 1;
       else
         num = num * base + c;
     }
 
@@ skipping 100 matching lines @@
       p++;
 
       for ( ; p < limit; p++ )
       {
         FT_Char  c;
 
 
         if ( IS_PS_SPACE( *p ) || *p OP 0x80 )
           break;
 
-        c = ft_char_table[*p & 0x7f];
+        c = ft_char_table[*p & 0x7F];
 
         if ( c < 0 || c >= 10 )
           break;
 
         /* only add digit if we don't overflow */
         if ( divider < 0xCCCCCCCL && decimal < 0xCCCCCCCL )
         {
           decimal = decimal * 10 + c;
 
           if ( !integral && power_ten > 0 )
@@ skipping 223 matching lines @@
     {
       FT_UInt  c = p[r];
 
 
       if ( IS_PS_SPACE( c ) )
         continue;
 
       if ( c OP 0x80 )
         break;
 
-      c = ft_char_table[c & 0x7F];
-      if ( (unsigned)c >= 16 )
+      c = (FT_UInt)ft_char_table[c & 0x7F];
+      if ( c >= 16 )
         break;
 
       pad = ( pad << 4 ) | c;
       if ( pad & 0x100 )
       {
         buffer[w++] = (FT_Byte)pad;
         pad         = 0x01;
       }
     }
 
@@ skipping 10 matching lines @@
     {
       FT_Char  c;
 
 
       if ( IS_PS_SPACE( *p ) )
         continue;
 
       if ( *p OP 0x80 )
         break;
 
-      c = ft_char_table[*p & 0x7f];
+      c = ft_char_table[*p & 0x7F];
 
       if ( (unsigned)c >= 16 )
         break;
 
       if ( r & 1 )
       {
         *buffer = (FT_Byte)(*buffer + c);
         buffer++;
       }
       else
@@ skipping 59 matching lines @@
     *cursor = p;
     *seed   = s;
 
 #endif /* 0 */
 
     return r;
   }
 
 
 /* END */