Update freetype to 2.5.4.

third_party/freetype/src/base/ftadvanc.c

 /***************************************************************************/
 /*                                                                         */
 /*  ftadvanc.c                                                             */
 /*                                                                         */
 /*    Quick computation of advance widths (body).                          */
 /*                                                                         */
-/*  Copyright 2008, 2009, 2011, 2013 by                                    */
+/*  Copyright 2008, 2009, 2011, 2013, 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 <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
 
-#include "../../include/freetype/ftadvanc.h"
-#include "../../include/freetype/internal/ftobjs.h"
+#include FT_ADVANCES_H
+#include FT_INTERNAL_OBJECTS_H
 
 
   static FT_Error
   _ft_face_scale_advances( FT_Face    face,
                            FT_Fixed*  advances,
                            FT_UInt    count,
                            FT_Int32   flags )
   {
     FT_Fixed  scale;
     FT_UInt   nn;
@@ skipping 39 matching lines @@
                   FT_UInt    gindex,
                   FT_Int32   flags,
                   FT_Fixed  *padvance )
   {
     FT_Face_GetAdvancesFunc  func;
 
 
     if ( !face )
       return FT_THROW( Invalid_Face_Handle );
 
+    if ( !padvance )
+      return FT_THROW( Invalid_Argument );
+
     if ( gindex >= (FT_UInt)face->num_glyphs )
       return FT_THROW( Invalid_Glyph_Index );
 
     func = face->driver->clazz->get_advances;
     if ( func && LOAD_ADVANCE_FAST_CHECK( flags ) )
     {
       FT_Error  error;
 
 
       error = func( face, gindex, 1, flags, padvance );
@@ skipping 18 matching lines @@
                    FT_Fixed  *padvances )
   {
     FT_Face_GetAdvancesFunc  func;
     FT_UInt                  num, end, nn;
     FT_Error                 error = FT_Err_Ok;
 
 
     if ( !face )
       return FT_THROW( Invalid_Face_Handle );
 
+    if ( !padvances )
+      return FT_THROW( Invalid_Argument );
+
     num = (FT_UInt)face->num_glyphs;
     end = start + count;
     if ( start >= num || end < start || end > num )
       return FT_THROW( Invalid_Glyph_Index );
 
     if ( count == 0 )
       return FT_Err_Ok;
 
     func = face->driver->clazz->get_advances;
     if ( func && LOAD_ADVANCE_FAST_CHECK( flags ) )
@@ skipping 22 matching lines @@
       padvances[nn] = ( flags & FT_LOAD_VERTICAL_LAYOUT )
                       ? face->glyph->advance.y << 10
                       : face->glyph->advance.x << 10;
     }
 
     return error;
   }
 
 
 /* END */