Update freetype to the latest version of Android external/freetype

src/cff/cffload.c

 /***************************************************************************/
 /*                                                                         */
 /*  cffload.c                                                              */
 /*                                                                         */
 /*    OpenType and CFF data/program tables loader (body).                  */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,   */
-/*            2010 by                                                      */
+/*  Copyright 1996-2011 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 1243 matching lines @@
           FT_UInt  sid = encoding->sids[j];
           FT_UInt  gid = 0;
 
 
           if ( sid )
             gid = cff_charset_cid_to_gindex( charset, sid );
 
           if ( gid != 0 )
           {
             encoding->codes[j] = (FT_UShort)gid;
-              encoding->count = j + 1;
+            encoding->count    = j + 1;
           }
           else
           {
             encoding->codes[j] = 0;
             encoding->sids [j] = 0;
           }
         }
         break;
 
       default:
@@ skipping 47 matching lines @@
     top->family_name         = 0xFFFFU;
     top->weight              = 0xFFFFU;
     top->embedded_postscript = 0xFFFFU;
 
     top->cid_registry        = 0xFFFFU;
     top->cid_ordering        = 0xFFFFU;
     top->cid_font_name       = 0xFFFFU;
 
     error = cff_index_access_element( idx, font_index, &dict, &dict_len );
     if ( !error )
+    {
+      FT_TRACE4(( " top dictionary:\n" ));
       error = cff_parser_run( &parser, dict, dict + dict_len );
+    }
 
     cff_index_forget_element( idx, &dict );
 
     if ( error )
       goto Exit;
 
     /* if it is a CID font, we stop there */
     if ( top->cid_registry != 0xFFFFU )
       goto Exit;
 
     /* parse the private dictionary, if any */
     if ( top->private_offset && top->private_size )
     {
       /* set defaults */
       FT_MEM_ZERO( priv, sizeof ( *priv ) );
 
       priv->blue_shift       = 7;
       priv->blue_fuzz        = 1;
       priv->lenIV            = -1;
       priv->expansion_factor = (FT_Fixed)( 0.06 * 0x10000L );
       priv->blue_scale       = (FT_Fixed)( 0.039625 * 0x10000L * 1000 );
 
       cff_parser_init( &parser, CFF_CODE_PRIVATE, priv, library );
 
       if ( FT_STREAM_SEEK( base_offset + font->font_dict.private_offset ) ||
            FT_FRAME_ENTER( font->font_dict.private_size )                 )
         goto Exit;
 
+      FT_TRACE4(( " private dictionary:\n" ));
       error = cff_parser_run( &parser,
                               (FT_Byte*)stream->cursor,
                               (FT_Byte*)stream->limit );
       FT_FRAME_EXIT();
       if ( error )
         goto Exit;
 
       /* ensure that `num_blue_values' is even */
       priv->num_blue_values &= ~1;
     }
@@ skipping 69 matching lines @@
 
     /* read CFF font header */
     if ( FT_STREAM_READ_FIELDS( cff_header_fields, font ) )
       goto Exit;
 
     /* check format */
     if ( font->version_major   != 1 ||
          font->header_size      < 4 ||
          font->absolute_offsize > 4 )
     {
-      FT_TRACE2(( "[not a CFF font header]\n" ));
+      FT_TRACE2(( "  not a CFF font header\n" ));
       error = CFF_Err_Unknown_File_Format;
       goto Exit;
     }
 
     /* skip the rest of the header */
     if ( FT_STREAM_SKIP( font->header_size - 4 ) )
       goto Exit;
 
     /* read the name, top dict, string and global subrs index */
     if ( FT_SET_ERROR( cff_index_init( &font->name_index,
@@ skipping 18 matching lines @@
       FT_ERROR(( "cff_font_load: incorrect face index = %d\n",
                  face_index ));
       error = CFF_Err_Invalid_Argument;
     }
 
     /* in case of a font format check, simply exit now */
     if ( face_index < 0 )
       goto Exit;
 
     /* now, parse the top-level font dictionary */
+    FT_TRACE4(( "parsing top-level\n" ));
     error = cff_subfont_load( &font->top_font,
                               &font->font_dict_index,
                               face_index,
                               stream,
                               base_offset,
                               library );
     if ( error )
       goto Exit;
 
     if ( FT_STREAM_SEEK( base_offset + dict->charstrings_offset ) )
@@ skipping 32 matching lines @@
         goto Fail_CID;
 
       /* set up pointer table */
       for ( idx = 0; idx < fd_index.count; idx++ )
         font->subfonts[idx] = sub + idx;
 
       /* now load each subfont independently */
       for ( idx = 0; idx < fd_index.count; idx++ )
       {
         sub = font->subfonts[idx];
+        FT_TRACE4(( "parsing subfont %u\n", idx ));
         error = cff_subfont_load( sub, &fd_index, idx,
                                   stream, base_offset, library );
         if ( error )
           goto Fail_CID;
       }
 
       /* now load the FD Select array */
       error = CFF_Load_FD_Select( &font->fd_select,
                                   font->charstrings_index.count,
                                   stream,
                                   base_offset + dict->cid_fd_select_offset );
 
     Fail_CID:
       cff_index_done( &fd_index );
 
       if ( error )
         goto Exit;
     }
     else
       font->num_subfonts = 0;
 
     /* read the charstrings index now */
     if ( dict->charstrings_offset == 0 )
     {
       FT_ERROR(( "cff_font_load: no charstrings offset\n" ));
-      error = CFF_Err_Unknown_File_Format;
+      error = CFF_Err_Invalid_File_Format;
       goto Exit;
     }
 
     font->num_glyphs = font->charstrings_index.count;
 
     error = cff_index_get_pointers( &font->global_subrs_index,
                                     &font->global_subrs, NULL );
 
     if ( error )
       goto Exit;
@@ skipping 67 matching lines @@
     FT_FREE( font->font_info );
 
     FT_FREE( font->font_name );
     FT_FREE( font->global_subrs );
     FT_FREE( font->strings );
     FT_FREE( font->string_pool );
   }
 
 
 /* END */