Update freetype to 2.5.4.

third_party/freetype/include/internal/ftobjs.h

 /***************************************************************************/
 /*                                                                         */
 /*  ftobjs.h                                                               */
 /*                                                                         */
 /*    The FreeType private base classes (specification).                   */
 /*                                                                         */
 /*  Copyright 1996-2006, 2008, 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.                                        */
 /*                                                                         */
 /***************************************************************************/
 
 
   /*************************************************************************/
   /*                                                                       */
   /*  This file contains the definition of all internal FreeType classes.  */
   /*                                                                       */
   /*************************************************************************/
 
 
 #ifndef __FTOBJS_H__
 #define __FTOBJS_H__
 
-#include "../../ft2build.h"
-#include "../ftrender.h"
-#include "../ftsizes.h"
-#include "../ftlcdfil.h"
-#include "ftmemory.h"
-#include "ftgloadr.h"
-#include "ftdriver.h"
-#include "autohint.h"
-#include "ftserv.h"
-#include "ftpic.h"
+#include <ft2build.h>
+#include FT_RENDER_H
+#include FT_SIZES_H
+#include FT_LCD_FILTER_H
+#include FT_INTERNAL_MEMORY_H
+#include FT_INTERNAL_GLYPH_LOADER_H
+#include FT_INTERNAL_DRIVER_H
+#include FT_INTERNAL_AUTOHINT_H
+#include FT_INTERNAL_SERVICE_H
+#include FT_INTERNAL_PIC_H
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
-#include "../ftincrem.h"
+#include FT_INCREMENTAL_H
 #endif
 
 
 FT_BEGIN_HEADER
 
 
   /*************************************************************************/
   /*                                                                       */
   /* Some generic definitions.                                             */
   /*                                                                       */
@@ skipping 13 matching lines @@
   /*************************************************************************/
   /*                                                                       */
   /* The min and max functions missing in C.  As usual, be careful not to  */
   /* write things like FT_MIN( a++, b++ ) to avoid side effects.           */
   /*                                                                       */
 #define FT_MIN( a, b )  ( (a) < (b) ? (a) : (b) )
 #define FT_MAX( a, b )  ( (a) > (b) ? (a) : (b) )
 
 #define FT_ABS( a )     ( (a) < 0 ? -(a) : (a) )
 
+  /*
+   *  Approximate sqrt(x*x+y*y) using the `alpha max plus beta min'
+   *  algorithm.  We use alpha = 1, beta = 3/8, giving us results with a
+   *  largest error less than 7% compared to the exact value.
+   */
+#define FT_HYPOT( x, y )                 \
+          ( x = FT_ABS( x ),             \
+            y = FT_ABS( y ),             \
+            x > y ? x + ( 3 * y >> 3 )   \
+                  : y + ( 3 * x >> 3 ) )
 
 #define FT_PAD_FLOOR( x, n )  ( (x) & ~((n)-1) )
 #define FT_PAD_ROUND( x, n )  FT_PAD_FLOOR( (x) + ((n)/2), n )
 #define FT_PAD_CEIL( x, n )   FT_PAD_FLOOR( (x) + ((n)-1), n )
 
 #define FT_PIX_FLOOR( x )     ( (x) & ~63 )
 #define FT_PIX_ROUND( x )     FT_PIX_FLOOR( (x) + 32 )
 #define FT_PIX_CEIL( x )      FT_PIX_FLOOR( (x) + 63 )
 
 
   /*
-   *  Return the highest power of 2 that is <= value; this correspond to
-   *  the highest bit in a given 32-bit value.
-   */
-  FT_BASE( FT_UInt32 )
-  ft_highpow2( FT_UInt32  value );
-
-
-  /*
    *  character classification functions -- since these are used to parse
    *  font files, we must not use those in <ctypes.h> which are
    *  locale-dependent
    */
 #define  ft_isdigit( x )   ( ( (unsigned)(x) - '0' ) < 10U )
 
 #define  ft_isxdigit( x )  ( ( (unsigned)(x) - '0' ) < 10U || \
                              ( (unsigned)(x) - 'a' ) < 6U  || \
                              ( (unsigned)(x) - 'A' ) < 6U  )
 
@@ skipping 1456 matching lines @@
 
 #endif /* FT_CONFIG_OPTION_PIC */
 
 
 FT_END_HEADER
 
 #endif /* __FTOBJS_H__ */
 
 
 /* END */