Update freetype to 2.5.4.

third_party/freetype/src/truetype/ttdriver.c

 /***************************************************************************/
 /*                                                                         */
 /*  ttdriver.c                                                             */
 /*                                                                         */
 /*    TrueType font driver implementation (body).                          */
 /*                                                                         */
-/*  Copyright 1996-2013 by                                                 */
+/*  Copyright 1996-2014 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.                                        */
 /*                                                                         */
 /***************************************************************************/
 
 
-#include "../../include/ft2build.h"
-#include "../../include/freetype/internal/ftdebug.h"
-#include "../../include/freetype/internal/ftstream.h"
-#include "../../include/freetype/internal/sfnt.h"
-#include "../../include/freetype/internal/services/svxf86nm.h"
+#include <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_STREAM_H
+#include FT_INTERNAL_SFNT_H
+#include FT_SERVICE_XFREE86_NAME_H
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-#include "../../include/freetype/ftmm.h"
-#include "../../include/freetype/internal/services/svmm.h"
+#include FT_MULTIPLE_MASTERS_H
+#include FT_SERVICE_MULTIPLE_MASTERS_H
 #endif
 
-#include "../../include/freetype/internal/services/svtteng.h"
-#include "../../include/freetype/internal/services/svttglyf.h"
-#include "../../include/freetype/internal/services/svprop.h"
-#include "../../include/freetype/ftttdrv.h"
+#include FT_SERVICE_TRUETYPE_ENGINE_H
+#include FT_SERVICE_TRUETYPE_GLYF_H
+#include FT_SERVICE_PROPERTIES_H
+#include FT_TRUETYPE_DRIVER_H
 
 #include "ttdriver.h"
 #include "ttgload.h"
 #include "ttpload.h"
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
 #include "ttgxvar.h"
 #endif
 
 #include "tterrors.h"
@@ skipping 164 matching lines @@
     /* XXX: TODO: check for sbits */
 
     if ( flags & FT_LOAD_VERTICAL_LAYOUT )
     {
       for ( nn = 0; nn < count; nn++ )
       {
         FT_Short   tsb;
         FT_UShort  ah;
 
 
-        TT_Get_VMetrics( face, start + nn, &tsb, &ah );
+        /* since we don't need `tsb', we use zero for `yMax' parameter */
+        TT_Get_VMetrics( face, start + nn, 0, &tsb, &ah );
         advances[nn] = ah;
       }
     }
     else
     {
       for ( nn = 0; nn < count; nn++ )
       {
         FT_Short   lsb;
         FT_UShort  aw;
 
@@ skipping 30 matching lines @@
     FT_Error  error  = FT_Err_Ok;
 
 
     ttsize->strike_index = strike_index;
 
     if ( FT_IS_SCALABLE( size->face ) )
     {
       /* use the scaled metrics, even when tt_size_reset fails */
       FT_Select_Metrics( size->face, strike_index );
 
-      tt_size_reset( ttsize );
+      tt_size_reset( ttsize ); /* ignore return value */
     }
     else
     {
       SFNT_Service      sfnt    = (SFNT_Service) ttface->sfnt;
       FT_Size_Metrics*  metrics = &size->metrics;
 
 
       error = sfnt->load_strike_metrics( ttface, strike_index, metrics );
       if ( error )
         ttsize->strike_index = 0xFFFFFFFFUL;
@@ skipping 82 matching lines @@
     FT_Error      error;
 
 
     if ( !slot )
       return FT_THROW( Invalid_Slot_Handle );
 
     if ( !size )
       return FT_THROW( Invalid_Size_Handle );
 
     if ( !face )
-      return FT_THROW( Invalid_Argument );
+      return FT_THROW( Invalid_Face_Handle );
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
     if ( glyph_index >= (FT_UInt)face->num_glyphs &&
          !face->internal->incremental_interface   )
 #else
     if ( glyph_index >= (FT_UInt)face->num_glyphs )
 #endif
       return FT_THROW( Invalid_Argument );
 
     if ( load_flags & FT_LOAD_NO_HINTING )
@@ skipping 147 matching lines @@
 
   FT_DEFINE_DRIVER(
     tt_driver_class,
 
       FT_MODULE_FONT_DRIVER     |
       FT_MODULE_DRIVER_SCALABLE |
       TT_HINTER_FLAG,
 
       sizeof ( TT_DriverRec ),
 
-      "truetype_xyq",      /* driver name                           */
+      "truetype",      /* driver name                           */
       0x10000L,        /* driver version == 1.0                 */
       0x20000L,        /* driver requires FreeType 2.0 or above */
 
       (void*)0,        /* driver specific interface */
 
       tt_driver_init,
       tt_driver_done,
       tt_get_interface,
 
     sizeof ( TT_FaceRec ),
@@ skipping 12 matching lines @@
     tt_get_kerning,
     0,                       /* FT_Face_AttachFunc */
     tt_get_advances,
 
     tt_size_request,
     TT_SIZE_SELECT
   )
 
 
 /* END */