Update freetype to latest version of ASOP.

src/sfnt/ttload.c

 /***************************************************************************/
 /*                                                                         */
 /*  ttload.c                                                               */
 /*                                                                         */
 /*    Load the basic TrueType tables, i.e., tables that can be either in   */
 /*    TTF or OTF fonts (body).                                             */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,   */
-/*            2010 by                                                      */
+/*  Copyright 1996-2010, 2012, 2013 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 116 matching lines @@
     table = tt_face_lookup_table( face, tag );
     if ( table )
     {
       if ( length )
         *length = table->Length;
 
       if ( FT_STREAM_SEEK( table->Offset ) )
         goto Exit;
     }
     else
-      error = SFNT_Err_Table_Missing;
+      error = FT_THROW( Table_Missing );
 
   Exit:
     return error;
   }
 
 
   /* Here, we                                                         */
   /*                                                                  */
   /* - check that `num_tables' is valid (and adjust it if necessary)  */
   /*                                                                  */
@@ skipping 74 matching lines @@
          * 0x38, so we will just check that it is greater.
          *
          * Note that according to the specification, the table must be
          * padded to 32-bit lengths, but this doesn't apply to the value of
          * its `Length' field!
          *
          */
         if ( table.Length < 0x36 )
         {
           FT_TRACE2(( "check_table_dir: `head' table too small\n" ));
-          error = SFNT_Err_Table_Missing;
+          error = FT_THROW( Table_Missing );
           goto Exit;
         }
 
         if ( FT_STREAM_SEEK( table.Offset + 12 ) ||
              FT_READ_ULONG( magic )              )
           goto Exit;
 
         if ( magic != 0x5F0F3CF5UL )
         {
           FT_TRACE2(( "check_table_dir:"
                       " no magic number found in `head' table\n"));
-          error = SFNT_Err_Table_Missing;
+          error = FT_THROW( Table_Missing );
           goto Exit;
         }
 
         if ( FT_STREAM_SEEK( offset + ( nn + 1 ) * 16 ) )
           goto Exit;
       }
       else if ( table.Tag == TTAG_SING )
         has_sing = 1;
       else if ( table.Tag == TTAG_META )
         has_meta = 1;
     }
 
     sfnt->num_tables = valid_entries;
 
     if ( sfnt->num_tables == 0 )
     {
       FT_TRACE2(( "check_table_dir: no tables found\n" ));
-      error = SFNT_Err_Unknown_File_Format;
+      error = FT_THROW( Unknown_File_Format );
       goto Exit;
     }
 
     /* if `sing' and `meta' tables are present, there is no `head' table */
     if ( has_head || ( has_sing && has_meta ) )
     {
-      error = SFNT_Err_Ok;
+      error = FT_Err_Ok;
       goto Exit;
     }
     else
     {
       FT_TRACE2(( "check_table_dir:" ));
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
       FT_TRACE2(( " neither `head', `bhed', nor `sing' table found\n" ));
 #else
       FT_TRACE2(( " neither `head' nor `sing' table found\n" ));
 #endif
-      error = SFNT_Err_Table_Missing;
+      error = FT_THROW( Table_Missing );
     }
 
   Exit:
     return error;
   }
 
 
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
@@ skipping 47 matching lines @@
     sfnt.offset = FT_STREAM_POS();
 
     if ( FT_READ_ULONG( sfnt.format_tag )                    ||
          FT_STREAM_READ_FIELDS( offset_table_fields, &sfnt ) )
       goto Exit;
 
     /* many fonts don't have these fields set correctly */
 #if 0
     if ( sfnt.search_range != 1 << ( sfnt.entry_selector + 4 )        ||
          sfnt.search_range + sfnt.range_shift != sfnt.num_tables << 4 )
-      return SFNT_Err_Unknown_File_Format;
+      return FT_THROW( Unknown_File_Format );
 #endif
 
     /* load the table directory */
 
     FT_TRACE2(( "-- Number of tables: %10u\n",    sfnt.num_tables ));
     FT_TRACE2(( "-- Format version:   0x%08lx\n", sfnt.format_tag ));
 
-    /* check first */
-    error = check_table_dir( &sfnt, stream );
-    if ( error )
+    if ( sfnt.format_tag != TTAG_OTTO )
     {
-      FT_TRACE2(( "tt_face_load_font_dir:"
-                  " invalid table directory for TrueType\n" ));
+      /* check first */
+      error = check_table_dir( &sfnt, stream );
+      if ( error )
+      {
+        FT_TRACE2(( "tt_face_load_font_dir:"
+                    " invalid table directory for TrueType\n" ));
 
-      goto Exit;
+        goto Exit;
+      }
     }
 
     face->num_tables = sfnt.num_tables;
     face->format_tag = sfnt.format_tag;
 
     if ( FT_QNEW_ARRAY( face->dir_tables, face->num_tables ) )
       goto Exit;
 
     if ( FT_STREAM_SEEK( sfnt.offset + 12 )       ||
          FT_FRAME_ENTER( face->num_tables * 16L ) )
@@ skipping 90 matching lines @@
     TT_Table   table;
     FT_ULong   size;
 
 
     if ( tag != 0 )
     {
       /* look for tag in font directory */
       table = tt_face_lookup_table( face, tag );
       if ( !table )
       {
-        error = SFNT_Err_Table_Missing;
+        error = FT_THROW( Table_Missing );
         goto Exit;
       }
 
       offset += table->Offset;
       size    = table->Length;
     }
     else
       /* tag == 0 -- the user wants to access the font file directly */
       size = face->root.stream->size;
 
     if ( length && *length == 0 )
     {
       *length = size;
 
-      return SFNT_Err_Ok;
+      return FT_Err_Ok;
     }
 
     if ( length )
       size = *length;
 
     stream = face->root.stream;
     /* the `if' is syntactic sugar for picky compilers */
     if ( FT_STREAM_READ_AT( offset, buffer, size ) )
       goto Exit;
 
@@ skipping 108 matching lines @@
   /* <Return>                                                              */
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
   FT_LOCAL_DEF( FT_Error )
   tt_face_load_maxp( TT_Face    face,
                      FT_Stream  stream )
   {
     FT_Error        error;
     TT_MaxProfile*  maxProfile = &face->max_profile;
 
-    const FT_Frame_Field  maxp_fields[] =
+    static const FT_Frame_Field  maxp_fields[] =
     {
 #undef  FT_STRUCTURE
 #define FT_STRUCTURE  TT_MaxProfile
 
       FT_FRAME_START( 6 ),
         FT_FRAME_LONG  ( version ),
         FT_FRAME_USHORT( numGlyphs ),
       FT_FRAME_END
     };
 
-    const FT_Frame_Field  maxp_fields_extra[] =
+    static const FT_Frame_Field  maxp_fields_extra[] =
     {
       FT_FRAME_START( 26 ),
         FT_FRAME_USHORT( maxPoints ),
         FT_FRAME_USHORT( maxContours ),
         FT_FRAME_USHORT( maxCompositePoints ),
         FT_FRAME_USHORT( maxCompositeContours ),
         FT_FRAME_USHORT( maxZones ),
         FT_FRAME_USHORT( maxTwilightPoints ),
         FT_FRAME_USHORT( maxStorage ),
         FT_FRAME_USHORT( maxFunctionDefs ),
@@ skipping 65 matching lines @@
     FT_TRACE3(( "numGlyphs: %u\n", maxProfile->numGlyphs ));
 
   Exit:
     return error;
   }
 
 
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
-  /*    tt_face_load_names                                                 */
+  /*    tt_face_load_name                                                  */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Loads the name records.                                            */
   /*                                                                       */
   /* <Input>                                                               */
   /*    face   :: A handle to the target face object.                      */
   /*                                                                       */
   /*    stream :: The input stream.                                        */
   /*                                                                       */
   /* <Return>                                                              */
@@ skipping 57 matching lines @@
     /* valid pointers within the name table...                          */
     /*                                                                  */
     /* We thus can't check `storageOffset' right now.                   */
     /*                                                                  */
     storage_start = table_pos + 6 + 12*table->numNameRecords;
     storage_limit = table_pos + table_len;
 
     if ( storage_start > storage_limit )
     {
       FT_ERROR(( "tt_face_load_name: invalid `name' table\n" ));
-      error = SFNT_Err_Name_Table_Missing;
+      error = FT_THROW( Name_Table_Missing );
       goto Exit;
     }
 
     /* Allocate the array of name records. */
     count                 = table->numNameRecords;
     table->numNameRecords = 0;
 
     if ( FT_NEW_ARRAY( table->names, count ) ||
          FT_FRAME_ENTER( count * 12 )        )
       goto Exit;
@@ skipping 132 matching lines @@
   /* <Return>                                                              */
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
   FT_LOCAL_DEF( FT_Error )
   tt_face_load_os2( TT_Face    face,
                     FT_Stream  stream )
   {
     FT_Error  error;
     TT_OS2*   os2;
 
-    const FT_Frame_Field  os2_fields[] =
+    static const FT_Frame_Field  os2_fields[] =
     {
 #undef  FT_STRUCTURE
 #define FT_STRUCTURE  TT_OS2
 
       FT_FRAME_START( 78 ),
         FT_FRAME_USHORT( version ),
         FT_FRAME_SHORT ( xAvgCharWidth ),
         FT_FRAME_USHORT( usWeightClass ),
         FT_FRAME_USHORT( usWidthClass ),
         FT_FRAME_SHORT ( fsType ),
@@ skipping 31 matching lines @@
         FT_FRAME_USHORT( usFirstCharIndex ),
         FT_FRAME_USHORT( usLastCharIndex ),
         FT_FRAME_SHORT ( sTypoAscender ),
         FT_FRAME_SHORT ( sTypoDescender ),
         FT_FRAME_SHORT ( sTypoLineGap ),
         FT_FRAME_USHORT( usWinAscent ),
         FT_FRAME_USHORT( usWinDescent ),
       FT_FRAME_END
     };
 
-    const FT_Frame_Field  os2_fields_extra[] =
+    static const FT_Frame_Field  os2_fields_extra[] =
     {
       FT_FRAME_START( 8 ),
         FT_FRAME_ULONG( ulCodePageRange1 ),
         FT_FRAME_ULONG( ulCodePageRange2 ),
       FT_FRAME_END
     };
 
-    const FT_Frame_Field  os2_fields_extra2[] =
+    static const FT_Frame_Field  os2_fields_extra2[] =
     {
       FT_FRAME_START( 10 ),
         FT_FRAME_SHORT ( sxHeight ),
         FT_FRAME_SHORT ( sCapHeight ),
         FT_FRAME_USHORT( usDefaultChar ),
         FT_FRAME_USHORT( usBreakChar ),
         FT_FRAME_USHORT( usMaxContext ),
       FT_FRAME_END
     };
 
@@ skipping 92 matching lines @@
     if ( FT_STREAM_READ_FIELDS( post_fields, post ) )
       return error;
 
     /* we don't load the glyph names, we do that in another */
     /* module (ttpost).                                     */
 
     FT_TRACE3(( "FormatType:   0x%x\n", post->FormatType ));
     FT_TRACE3(( "isFixedPitch:   %s\n", post->isFixedPitch
                                         ? "  yes" : "   no" ));
 
-    return SFNT_Err_Ok;
+    return FT_Err_Ok;
   }
 
 
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
   /*    tt_face_load_pclt                                                  */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Loads the PCL 5 Table.                                             */
@@ skipping 87 matching lines @@
 
     face->gasp.version   = FT_GET_USHORT();
     face->gasp.numRanges = FT_GET_USHORT();
 
     FT_FRAME_EXIT();
 
     /* only support versions 0 and 1 of the table */
     if ( face->gasp.version >= 2 )
     {
       face->gasp.numRanges = 0;
-      error = SFNT_Err_Invalid_Table;
+      error = FT_THROW( Invalid_Table );
       goto Exit;
     }
 
     num_ranges = face->gasp.numRanges;
     FT_TRACE3(( "numRanges: %u\n", num_ranges ));
 
-    if ( FT_QNEW_ARRAY( gaspranges, num_ranges ) ||
-         FT_FRAME_ENTER( num_ranges * 4L )      )
+    if ( FT_QNEW_ARRAY( face->gasp.gaspRanges, num_ranges ) ||
+         FT_FRAME_ENTER( num_ranges * 4L )                  )
       goto Exit;
 
-    face->gasp.gaspRanges = gaspranges;
+    gaspranges = face->gasp.gaspRanges;
 
     for ( j = 0; j < num_ranges; j++ )
     {
       gaspranges[j].maxPPEM  = FT_GET_USHORT();
       gaspranges[j].gaspFlag = FT_GET_USHORT();
 
       FT_TRACE3(( "gaspRange %d: rangeMaxPPEM %5d, rangeGaspBehavior 0x%x\n",
                   j,
                   gaspranges[j].maxPPEM,
                   gaspranges[j].gaspFlag ));
     }
 
     FT_FRAME_EXIT();
 
   Exit:
     return error;
   }
 
 
 /* END */