Merge to XFA: Update bundled freetype to 2.6.1

third_party/freetype/include/freetype/ftcache.h

Index: third_party/freetype/include/freetype/ftcache.h
diff --git a/third_party/freetype/include/ftcache.h b/third_party/freetype/include/freetype/ftcache.h
similarity index 99%
rename from third_party/freetype/include/ftcache.h
rename to third_party/freetype/include/freetype/ftcache.h
index a30e925cc5689606dfa5675e1552bfc3c85810c0..68525bb8294baf1f4ebd55ec6067fb19c4530622 100644
--- a/third_party/freetype/include/ftcache.h
+++ b/third_party/freetype/include/freetype/ftcache.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType Cache subsystem (specification).                            */
 /*                                                                         */
-/*  Copyright 1996-2008, 2010, 2013, 2014 by                               */
+/*  Copyright 1996-2015 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -667,8 +667,8 @@ FT_BEGIN_HEADER
   typedef struct  FTC_ImageTypeRec_
   {
     FTC_FaceID  face_id;
-    FT_Int      width;
-    FT_Int      height;
+    FT_UInt     width;
+    FT_UInt     height;
     FT_Int32    flags;
 
   } FTC_ImageTypeRec;