Index: third_party/freetype/include/ftglyph.h |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftglyph.h b/third_party/freetype/include/ftglyph.h |
similarity index 95% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftglyph.h |
rename to third_party/freetype/include/ftglyph.h |
index ec2d9d89c16e375f594b6b17ea8a4832945cf402..15fa6a995058a73a5c75cb2ac2a7e53e16da40f5 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftglyph.h |
+++ b/third_party/freetype/include/ftglyph.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* FreeType convenience functions to handle glyphs (specification). */ |
/* */ |
-/* Copyright 1996-2003, 2006, 2008, 2009, 2011 by */ |
+/* Copyright 1996-2003, 2006, 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, */ |
@@ -33,8 +33,8 @@ |
#define __FTGLYPH_H__ |
-#include "../ft2build.h" |
-#include "freetype.h" |
+#include <ft2build.h> |
+#include FT_FREETYPE_H |
#ifdef FREETYPE_H |
#error "freetype.h of FreeType 1 has been loaded!" |
@@ -325,22 +325,8 @@ FT_BEGIN_HEADER |
} FT_Glyph_BBox_Mode; |
- /*************************************************************************/ |
- /* */ |
- /* <Enum> */ |
- /* ft_glyph_bbox_xxx */ |
- /* */ |
- /* <Description> */ |
- /* These constants are deprecated. Use the corresponding */ |
- /* @FT_Glyph_BBox_Mode values instead. */ |
- /* */ |
- /* <Values> */ |
- /* ft_glyph_bbox_unscaled :: See @FT_GLYPH_BBOX_UNSCALED. */ |
- /* ft_glyph_bbox_subpixels :: See @FT_GLYPH_BBOX_SUBPIXELS. */ |
- /* ft_glyph_bbox_gridfit :: See @FT_GLYPH_BBOX_GRIDFIT. */ |
- /* ft_glyph_bbox_truncate :: See @FT_GLYPH_BBOX_TRUNCATE. */ |
- /* ft_glyph_bbox_pixels :: See @FT_GLYPH_BBOX_PIXELS. */ |
- /* */ |
+ /* these constants are deprecated; use the corresponding */ |
+ /* `FT_Glyph_BBox_Mode' values instead */ |
#define ft_glyph_bbox_unscaled FT_GLYPH_BBOX_UNSCALED |
#define ft_glyph_bbox_subpixels FT_GLYPH_BBOX_SUBPIXELS |
#define ft_glyph_bbox_gridfit FT_GLYPH_BBOX_GRIDFIT |
@@ -358,17 +344,17 @@ FT_BEGIN_HEADER |
/* outline's points, including Bézier control points. Though it */ |
/* coincides with the exact bounding box for most glyphs, it can be */ |
/* slightly larger in some situations (like when rotating an outline */ |
- /* which contains Bézier outside arcs). */ |
+ /* that contains Bézier outside arcs). */ |
/* */ |
/* Computing the control box is very fast, while getting the bounding */ |
/* box can take much more time as it needs to walk over all segments */ |
/* and arcs in the outline. To get the latter, you can use the */ |
- /* `ftbbox' component which is dedicated to this single task. */ |
+ /* `ftbbox' component, which is dedicated to this single task. */ |
/* */ |
/* <Input> */ |
/* glyph :: A handle to the source glyph object. */ |
/* */ |
- /* mode :: The mode which indicates how to interpret the returned */ |
+ /* mode :: The mode that indicates how to interpret the returned */ |
/* bounding box values. */ |
/* */ |
/* <Output> */ |
@@ -388,7 +374,7 @@ FT_BEGIN_HEADER |
/* @FT_LOAD_NO_SCALE, the resulting CBox is meaningless. To get */ |
/* reasonable values for the CBox it is necessary to load the glyph */ |
/* at a large ppem value (so that the hinting instructions can */ |
- /* properly shift and scale the subglyphs), then extracting the CBox */ |
+ /* properly shift and scale the subglyphs), then extracting the CBox, */ |
/* which can be eventually converted back to font units. */ |
/* */ |
/* Note that the maximum coordinates are exclusive, which means that */ |
@@ -603,7 +589,6 @@ FT_BEGIN_HEADER |
FT_EXPORT( FT_Error ) |
FT_Matrix_Invert( FT_Matrix* matrix ); |
- |
/* */ |