Update freetype to 2.5.4.

third_party/freetype/src/base/ftpfr.c

 /***************************************************************************/
 /*                                                                         */
 /*  ftpfr.c                                                                */
 /*                                                                         */
 /*    FreeType API for accessing PFR-specific data (body).                 */
 /*                                                                         */
-/*  Copyright 2002-2004, 2008, 2010, 2013 by                               */
+/*  Copyright 2002-2004, 2008, 2010, 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/internal/ftobjs.h"
-#include "../../include/freetype/internal/services/svpfr.h"
+#include FT_INTERNAL_OBJECTS_H
+#include FT_SERVICE_PFR_H
 
 
   /* check the format */
   static FT_Service_PfrMetrics
   ft_pfr_check( FT_Face  face )
   {
     FT_Service_PfrMetrics  service = NULL;
 
 
     if ( face )
@@ skipping 10 matching lines @@
                       FT_UInt   *aoutline_resolution,
                       FT_UInt   *ametrics_resolution,
                       FT_Fixed  *ametrics_x_scale,
                       FT_Fixed  *ametrics_y_scale )
   {
     FT_Error               error = FT_Err_Ok;
     FT_Service_PfrMetrics  service;
 
 
     if ( !face )
-      return FT_THROW( Invalid_Argument );
+      return FT_THROW( Invalid_Face_Handle );
 
     service = ft_pfr_check( face );
     if ( service )
     {
       error = service->get_metrics( face,
                                     aoutline_resolution,
                                     ametrics_resolution,
                                     ametrics_x_scale,
                                     ametrics_y_scale );
     }
@@ skipping 35 matching lines @@
   FT_Get_PFR_Kerning( FT_Face     face,
                       FT_UInt     left,
                       FT_UInt     right,
                       FT_Vector  *avector )
   {
     FT_Error               error;
     FT_Service_PfrMetrics  service;
 
 
     if ( !face )
+      return FT_THROW( Invalid_Face_Handle );
+
+    if ( !avector )
       return FT_THROW( Invalid_Argument );
 
     service = ft_pfr_check( face );
     if ( service )
       error = service->get_kerning( face, left, right, avector );
     else
       error = FT_Get_Kerning( face, left, right,
                               FT_KERNING_UNSCALED, avector );
 
     return error;
   }
 
 
   /* documentation is in ftpfr.h */
 
   FT_EXPORT_DEF( FT_Error )
   FT_Get_PFR_Advance( FT_Face   face,
                       FT_UInt   gindex,
                       FT_Pos   *aadvance )
   {
     FT_Error               error;
     FT_Service_PfrMetrics  service;
 
 
+    if ( !face )
+      return FT_THROW( Invalid_Face_Handle );
+
+    if ( !aadvance )
+      return FT_THROW( Invalid_Argument );
+
     service = ft_pfr_check( face );
     if ( service )
-    {
       error = service->get_advance( face, gindex, aadvance );
-    }
     else
       /* XXX: TODO: PROVIDE ADVANCE-LOADING METHOD TO ALL FONT DRIVERS */
       error = FT_THROW( Invalid_Argument );
 
     return error;
   }
 
 
 /* END */