Update freetype to latest version of ASOP.

src/sfnt/ttbdf.c

 /***************************************************************************/
 /*                                                                         */
 /*  ttbdf.c                                                                */
 /*                                                                         */
 /*    TrueType and OpenType embedded BDF properties (body).                */
 /*                                                                         */
-/*  Copyright 2005, 2006, 2010 by                                          */
+/*  Copyright 2005, 2006, 2010, 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 49 matching lines @@
     FT_Error  error;
 
 
     FT_ZERO( bdf );
 
     error = tt_face_goto_table( face, TTAG_BDF, stream, &length );
     if ( error                                  ||
          length < 8                             ||
          FT_FRAME_EXTRACT( length, bdf->table ) )
     {
-      error = SFNT_Err_Invalid_Table;
+      error = FT_THROW( Invalid_Table );
       goto Exit;
     }
 
     bdf->table_end = bdf->table + length;
 
     {
       FT_Byte*   p           = bdf->table;
       FT_UInt    version     = FT_NEXT_USHORT( p );
       FT_UInt    num_strikes = FT_NEXT_USHORT( p );
       FT_ULong   strings     = FT_NEXT_ULONG ( p );
@@ skipping 36 matching lines @@
     }
 
     bdf->loaded = 1;
 
   Exit:
     return error;
 
   BadTable:
     FT_FRAME_RELEASE( bdf->table );
     FT_ZERO( bdf );
-    error = SFNT_Err_Invalid_Table;
+    error = FT_THROW( Invalid_Table );
     goto Exit;
   }
 
 
   FT_LOCAL_DEF( FT_Error )
   tt_face_find_bdf_prop( TT_Face           face,
                          const char*       property_name,
                          BDF_PropertyRec  *aprop )
   {
     TT_BDF     bdf   = &face->bdf;
     FT_Size    size  = FT_FACE(face)->size;
-    FT_Error   error = SFNT_Err_Ok;
+    FT_Error   error = FT_Err_Ok;
     FT_Byte*   p;
     FT_UInt    count;
     FT_Byte*   strike;
     FT_Offset  property_len;
 
 
     aprop->type = BDF_PROPERTY_TYPE_NONE;
 
     if ( bdf->loaded == 0 )
     {
       error = tt_face_load_bdf_props( face, FT_FACE( face )->stream );
       if ( error )
         goto Exit;
     }
 
     count  = bdf->num_strikes;
     p      = bdf->table + 8;
     strike = p + 4 * count;
 
-    error = SFNT_Err_Invalid_Argument;
+    error = FT_ERR( Invalid_Argument );
 
     if ( size == NULL || property_name == NULL )
       goto Exit;
 
     property_len = ft_strlen( property_name );
     if ( property_len == 0 )
       goto Exit;
 
     for ( ; count > 0; count-- )
     {
@@ skipping 31 matching lines @@
           switch ( type & 0x0F )
           {
           case 0x00:  /* string */
           case 0x01:  /* atoms */
             /* check that the content is really 0-terminated */
             if ( value < bdf->strings_size &&
                  ft_memchr( bdf->strings + value, 0, bdf->strings_size ) )
             {
               aprop->type   = BDF_PROPERTY_TYPE_ATOM;
               aprop->u.atom = (const char*)bdf->strings + value;
-              error         = SFNT_Err_Ok;
+              error         = FT_Err_Ok;
               goto Exit;
             }
             break;
 
           case 0x02:
             aprop->type      = BDF_PROPERTY_TYPE_INTEGER;
             aprop->u.integer = (FT_Int32)value;
-            error            = SFNT_Err_Ok;
+            error            = FT_Err_Ok;
             goto Exit;
 
           case 0x03:
             aprop->type       = BDF_PROPERTY_TYPE_CARDINAL;
             aprop->u.cardinal = value;
-            error             = SFNT_Err_Ok;
+            error             = FT_Err_Ok;
             goto Exit;
 
           default:
             ;
           }
         }
       }
       p += 10;
     }
 
   Exit:
     return error;
   }
 
 #endif /* TT_CONFIG_OPTION_BDF */
 
 
 /* END */