Update bundled freetype to 2.6.1

third_party/freetype/src/cff/cffload.c

 /***************************************************************************/
 /*                                                                         */
 /*  cffload.c                                                              */
 /*                                                                         */
 /*    OpenType and CFF data/program tables loader (body).                  */
 /*                                                                         */
-/*  Copyright 1996-2014 by                                                 */
+/*  Copyright 1996-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 332 matching lines @@
           poff[0] = p[0];
         break;
 
       case 2:
         for ( ; p < p_end; p += 2, poff++ )
           poff[0] = FT_PEEK_USHORT( p );
         break;
 
       case 3:
         for ( ; p < p_end; p += 3, poff++ )
-          poff[0] = FT_PEEK_OFF3( p );
+          poff[0] = FT_PEEK_UOFF3( p );
         break;
 
       default:
         for ( ; p < p_end; p += 4, poff++ )
           poff[0] = FT_PEEK_ULONG( p );
       }
 
       FT_FRAME_EXIT();
     }
 
@@ skipping 431 matching lines @@
       if ( charset->sids[i] > max_cid )
         max_cid = charset->sids[i];
     }
 
     if ( FT_NEW_ARRAY( charset->cids, (FT_ULong)max_cid + 1 ) )
       goto Exit;
 
     /* When multiple GIDs map to the same CID, we choose the lowest */
     /* GID.  This is not described in any spec, but it matches the  */
     /* behaviour of recent Acroread versions.                       */
-    for ( j = num_glyphs - 1; j >= 0 ; j-- )
+    for ( j = (FT_Long)num_glyphs - 1; j >= 0 ; j-- )
       charset->cids[charset->sids[j]] = (FT_UShort)j;
 
     charset->max_cid    = max_cid;
     charset->num_glyphs = num_glyphs;
 
   Exit:
     return error;
   }
 
 
@@ skipping 617 matching lines @@
         FT_FRAME_BYTE( header_size ),
         FT_FRAME_BYTE( absolute_offsize ),
       FT_FRAME_END
     };
 
     FT_Error         error;
     FT_Memory        memory = stream->memory;
     FT_ULong         base_offset;
     CFF_FontRecDict  dict;
     CFF_IndexRec     string_index;
-    FT_Int           subfont_index;
+    FT_UInt          subfont_index;
 
 
     FT_ZERO( font );
     FT_ZERO( &string_index );
 
     font->stream = stream;
     font->memory = memory;
     dict         = &font->top_font.font_dict;
     base_offset  = FT_STREAM_POS();
 
@@ skipping 27 matching lines @@
          FT_SET_ERROR( cff_index_get_pointers( &string_index,
                                                &font->strings,
                                                &font->string_pool ) ) )
       goto Exit;
 
     font->num_strings = string_index.count;
 
     if ( pure_cff )
     {
       /* well, we don't really forget the `disabled' fonts... */
-      subfont_index = face_index;
+      subfont_index = (FT_UInt)( face_index & 0xFFFF );
 
-      if ( subfont_index >= (FT_Int)font->name_index.count )
+      if ( face_index > 0 && subfont_index >= font->name_index.count )
       {
         FT_ERROR(( "cff_font_load:"
                    " invalid subfont index for pure CFF font (%d)\n",
                    subfont_index ));
         error = FT_THROW( Invalid_Argument );
         goto Exit;
       }
 
       font->num_faces = font->name_index.count;
     }
@@ skipping 183 matching lines @@
 
     if ( font->cf2_instance.finalizer )
     {
       font->cf2_instance.finalizer( font->cf2_instance.data );
       FT_FREE( font->cf2_instance.data );
     }
   }
 
 
 /* END */