Update bundled freetype to 2.6.1

third_party/freetype/src/psaux/t1decode.c

 /***************************************************************************/
 /*                                                                         */
 /*  t1decode.c                                                             */
 /*                                                                         */
 /*    PostScript Type 1 decoding routines (body).                          */
 /*                                                                         */
-/*  Copyright 2000-2014 by                                                 */
+/*  Copyright 2000-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 125 matching lines @@
                    psnames->adobe_std_encoding[charcode]);
 
     for ( n = 0; n < decoder->num_glyphs; n++ )
     {
       FT_String*  name = (FT_String*)decoder->glyph_names[n];
 
 
       if ( name                               &&
            name[0] == glyph_name[0]           &&
            ft_strcmp( name, glyph_name ) == 0 )
-        return n;
+        return (FT_Int)n;
     }
 
     return -1;
   }
 
 
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
   /*    t1operator_seac                                                    */
@@ skipping 127 matching lines @@
       goto Exit;
     }
 
     /* First load `bchar' in builder */
     /* now load the unscaled outline */
 
     FT_GlyphLoader_Prepare( decoder->builder.loader );  /* prepare loader */
 
     /* the seac operator must not be nested */
     decoder->seac = TRUE;
-    error = t1_decoder_parse_glyph( decoder, bchar_index );
+    error = t1_decoder_parse_glyph( decoder, (FT_UInt)bchar_index );
     decoder->seac = FALSE;
     if ( error )
       goto Exit;
 
     /* save the left bearing and width of the base character */
     /* as they will be erased by the next load.              */
 
     left_bearing = decoder->builder.left_bearing;
     advance      = decoder->builder.advance;
 
     decoder->builder.left_bearing.x = 0;
     decoder->builder.left_bearing.y = 0;
 
     decoder->builder.pos_x = adx - asb;
     decoder->builder.pos_y = ady;
 
     /* Now load `achar' on top of */
     /* the base outline           */
 
     /* the seac operator must not be nested */
     decoder->seac = TRUE;
-    error = t1_decoder_parse_glyph( decoder, achar_index );
+    error = t1_decoder_parse_glyph( decoder, (FT_UInt)achar_index );
     decoder->seac = FALSE;
     if ( error )
       goto Exit;
 
     /* restore the left side bearing and   */
     /* advance width of the base character */
 
     decoder->builder.left_bearing = left_bearing;
     decoder->builder.advance      = advance;
 
@@ skipping 40 matching lines @@
     FT_Fixed         seed;
 
     T1_Hints_Funcs   hinter;
 
 #ifdef FT_DEBUG_LEVEL_TRACE
     FT_Bool          bol = TRUE;
 #endif
 
 
     /* compute random seed from stack address of parameter */
-    seed = (FT_Fixed)( ( (FT_PtrDist)(char*)&seed              ^
-                         (FT_PtrDist)(char*)&decoder           ^
-                         (FT_PtrDist)(char*)&charstring_base ) &
-                         FT_ULONG_MAX ) ;
+    seed = (FT_Fixed)( ( (FT_Offset)(char*)&seed            ^
+                         (FT_Offset)(char*)&decoder         ^
+                         (FT_Offset)(char*)&charstring_base ) &
+                         FT_ULONG_MAX                         );
     seed = ( seed ^ ( seed >> 10 ) ^ ( seed >> 20 ) ) & 0xFFFFL;
     if ( seed == 0 )
       seed = 0x7384;
 
     /* First of all, initialize the decoder */
     decoder->top  = decoder->stack;
     decoder->zone = decoder->zones;
     zone          = decoder->zones;
 
     builder->parse_state = T1_Parse_Start;
@@ skipping 391 matching lines @@
           }
           break;
 
         case 3:                     /* change hints */
           if ( arg_cnt != 1 )
             goto Unexpected_OtherSubr;
 
           known_othersubr_result_cnt = 1;
 
           if ( hinter )
-            hinter->reset( hinter->hints, builder->current->n_points );
+            hinter->reset( hinter->hints,
+                           (FT_UInt)builder->current->n_points );
           break;
 
         case 12:
         case 13:
           /* counter control hints, clear stack */
           top = decoder->stack;
           break;
 
         case 14:
         case 15:
@@ skipping 44 matching lines @@
             {
               FT_Long  tmp = values[0];
 
 
               for ( mm = 1; mm < blend->num_designs; mm++ )
                 tmp += FT_MulFix( *delta++, blend->weight_vector[mm] );
 
               *values++ = tmp;
             }
 
-            known_othersubr_result_cnt = num_points;
+            known_othersubr_result_cnt = (FT_Int)num_points;
             break;
           }
 
         case 19:
           /* <idx> 1 19 callothersubr                             */
           /* => replace elements starting from index cvi( <idx> ) */
           /*    of BuildCharArray with WeightVector               */
           {
             FT_Int    idx;
             PS_Blend  blend = decoder->blend;
 
 
             if ( arg_cnt != 1 || blend == NULL )
               goto Unexpected_OtherSubr;
 
             idx = Fix2Int( top[0] );
 
-            if ( idx < 0                                           ||
-                 idx + blend->num_designs > decoder->len_buildchar )
+            if ( idx < 0                                                    ||
+                 (FT_UInt)idx + blend->num_designs > decoder->len_buildchar )
               goto Unexpected_OtherSubr;
 
             ft_memcpy( &decoder->buildchar[idx],
                        blend->weight_vector,
                        blend->num_designs *
                          sizeof ( blend->weight_vector[0] ) );
           }
           break;
 
         case 20:
@@ skipping 193 matching lines @@
         switch ( op )
         {
         case op_endchar:
           FT_TRACE4(( " endchar\n" ));
 
           t1_builder_close_contour( builder );
 
           /* close hints recording session */
           if ( hinter )
           {
-            if ( hinter->close( hinter->hints, builder->current->n_points ) )
+            if ( hinter->close( hinter->hints,
+                                (FT_UInt)builder->current->n_points ) )
               goto Syntax_Error;
 
             /* apply hints to the loaded glyph outline now */
             error = hinter->apply( hinter->hints,
                                    builder->current,
                                    (PSH_Globals)builder->hints_globals,
                                    decoder->hint_mode );
             if ( error )
               goto Fail;
           }
@@ skipping 231 matching lines @@
           break;
 
         case op_callsubr:
           {
             FT_Int  idx;
 
 
             FT_TRACE4(( " callsubr" ));
 
             idx = Fix2Int( top[0] );
-            if ( idx < 0 || idx >= (FT_Int)decoder->num_subrs )
+            if ( idx < 0 || idx >= decoder->num_subrs )
             {
               FT_ERROR(( "t1_decoder_parse_charstrings:"
                          " invalid subrs index\n" ));
               goto Syntax_Error;
             }
 
             if ( zone - decoder->zones >= T1_MAX_SUBRS_CALLS )
             {
               FT_ERROR(( "t1_decoder_parse_charstrings:"
                          " too many nested subrs\n" ));
@@ skipping 212 matching lines @@
                    FT_Byte**            glyph_names,
                    PS_Blend             blend,
                    FT_Bool              hinting,
                    FT_Render_Mode       hint_mode,
                    T1_Decoder_Callback  parse_callback )
   {
     FT_MEM_ZERO( decoder, sizeof ( *decoder ) );
 
     /* retrieve PSNames interface from list of current modules */
     {
-      FT_Service_PsCMaps  psnames = 0;
+      FT_Service_PsCMaps  psnames;
 
 
       FT_FACE_FIND_GLOBAL_SERVICE( face, psnames, POSTSCRIPT_CMAPS );
       if ( !psnames )
       {
         FT_ERROR(( "t1_decoder_init:"
                    " the `psnames' module is not available\n" ));
         return FT_THROW( Unimplemented_Feature );
       }
 
@@ skipping 20 matching lines @@
 
   /* finalize T1 decoder */
   FT_LOCAL_DEF( void )
   t1_decoder_done( T1_Decoder  decoder )
   {
     t1_builder_done( &decoder->builder );
   }
 
 
 /* END */