Update freetype to 2.5.4.

third_party/freetype/src/truetype/ttobjs.h

 /***************************************************************************/
 /*                                                                         */
 /*  ttobjs.h                                                               */
 /*                                                                         */
 /*    Objects manager (specification).                                     */
 /*                                                                         */
-/*  Copyright 1996-2009, 2011-2013 by                                      */
+/*  Copyright 1996-2009, 2011-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.                                        */
 /*                                                                         */
 /***************************************************************************/
 
 
 #ifndef __TTOBJS_H__
 #define __TTOBJS_H__
 
 
-#include "../../include/ft2build.h"
-#include "../../include/freetype/internal/ftobjs.h"
-#include "../../include/freetype/internal/tttypes.h"
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_TRUETYPE_TYPES_H
 
 
 FT_BEGIN_HEADER
 
 
   /*************************************************************************/
   /*                                                                       */
   /* <Type>                                                                */
   /*    TT_Driver                                                          */
   /*                                                                       */
@@ skipping 52 matching lines @@
 #endif
 
     FT_Long        loop;
     FT_F26Dot6     minimum_distance;
     FT_Int         round_state;
 
     FT_Bool        auto_flip;
     FT_F26Dot6     control_value_cutin;
     FT_F26Dot6     single_width_cutin;
     FT_F26Dot6     single_width_value;
-    FT_Short       delta_base;
-    FT_Short       delta_shift;
+    FT_UShort      delta_base;
+    FT_UShort      delta_shift;
 
     FT_Byte        instruct_control;
     /* According to Greg Hitchcock from Microsoft, the `scan_control'     */
     /* variable as documented in the TrueType specification is a 32-bit   */
     /* integer; the high-word part holds the SCANTYPE value, the low-word */
     /* part the SCANCTRL value.  We separate it into two fields.          */
     FT_Bool        scan_control;
     FT_Int         scan_type;
 
     FT_UShort      gep0;
@@ skipping 216 matching lines @@
 
     /* debugging variables */
 
     /* When using the debugger, we must keep the */
     /* execution context tied to the instance    */
     /* object rather than asking it on demand.   */
 
     FT_Bool            debug;
     TT_ExecContext     context;
 
-    FT_Bool            bytecode_ready;
-    FT_Bool            cvt_ready;
+    /* if negative, `fpgm' (resp. `prep'), wasn't executed yet; */
+    /* otherwise it is the returned error code                  */
+    FT_Error           bytecode_ready;
+    FT_Error           cvt_ready;
 
 #endif /* TT_USE_BYTECODE_INTERPRETER */
 
   } TT_SizeRec;
 
 
   /*************************************************************************/
   /*                                                                       */
   /* TrueType driver class.                                                */
   /*                                                                       */
@@ skipping 85 matching lines @@
   /* auxiliary */
 #define IS_HINTED( flags )  ( ( flags & FT_LOAD_NO_HINTING ) == 0 )
 
 
 FT_END_HEADER
 
 #endif /* __TTOBJS_H__ */
 
 
 /* END */