Index: third_party/freetype/include/ftoutln.h |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftoutln.h b/third_party/freetype/include/ftoutln.h |
similarity index 94% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftoutln.h |
rename to third_party/freetype/include/ftoutln.h |
index ca94947af5a972331a8058fad1bca37434e76f80..d3b8fbd2658d9168320957d7797510f5e8c6ccde 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftoutln.h |
+++ b/third_party/freetype/include/ftoutln.h |
@@ -5,7 +5,7 @@ |
/* Support for the FT_Outline type used to store glyph shapes of */ |
/* most scalable font formats (specification). */ |
/* */ |
-/* Copyright 1996-2003, 2005-2012 by */ |
+/* Copyright 1996-2003, 2005-2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -21,8 +21,8 @@ |
#define __FTOUTLN_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!" |
@@ -52,7 +52,6 @@ FT_BEGIN_HEADER |
/* */ |
/* <Order> */ |
/* FT_Outline */ |
- /* FT_OUTLINE_FLAGS */ |
/* FT_Outline_New */ |
/* FT_Outline_Done */ |
/* FT_Outline_Copy */ |
@@ -68,13 +67,17 @@ FT_BEGIN_HEADER |
/* */ |
/* FT_Outline_Get_Bitmap */ |
/* FT_Outline_Render */ |
- /* */ |
/* FT_Outline_Decompose */ |
/* FT_Outline_Funcs */ |
- /* FT_Outline_MoveTo_Func */ |
- /* FT_Outline_LineTo_Func */ |
- /* FT_Outline_ConicTo_Func */ |
- /* FT_Outline_CubicTo_Func */ |
+ /* FT_Outline_MoveToFunc */ |
+ /* FT_Outline_LineToFunc */ |
+ /* FT_Outline_ConicToFunc */ |
+ /* FT_Outline_CubicToFunc */ |
+ /* */ |
+ /* FT_Orientation */ |
+ /* FT_Outline_Get_Orientation */ |
+ /* */ |
+ /* FT_OUTLINE_XXX */ |
/* */ |
/*************************************************************************/ |
@@ -97,7 +100,7 @@ FT_BEGIN_HEADER |
/* operations. */ |
/* */ |
/* <InOut> */ |
- /* user :: A typeless pointer which is passed to each */ |
+ /* user :: A typeless pointer that is passed to each */ |
/* emitter during the decomposition. It can be */ |
/* used to store the state during the */ |
/* decomposition. */ |
@@ -105,6 +108,13 @@ FT_BEGIN_HEADER |
/* <Return> */ |
/* FreeType error code. 0~means success. */ |
/* */ |
+ /* <Note> */ |
+ /* A contour that contains a single point only is represented by a */ |
+ /* `move to' operation followed by `line to' to the same point. In */ |
+ /* most cases, it is best to filter this out before using the */ |
+ /* outline for stroking purposes (otherwise it would result in a */ |
+ /* visible dot when round caps are used). */ |
+ /* */ |
FT_EXPORT( FT_Error ) |
FT_Outline_Decompose( FT_Outline* outline, |
const FT_Outline_Funcs* func_interface, |
@@ -217,12 +227,12 @@ FT_BEGIN_HEADER |
/* the 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> */ |
/* outline :: A pointer to the source outline descriptor. */ |
@@ -348,6 +358,9 @@ FT_BEGIN_HEADER |
/* FT_Outline_Embolden( &face->slot->outline, strength ); */ |
/* } */ |
/* */ |
+ /* To get meaningful results, font scaling values must be set with */ |
+ /* functions like @FT_Set_Char_Size before calling FT_Render_Glyph. */ |
+ /* */ |
FT_EXPORT( FT_Error ) |
FT_Outline_Embolden( FT_Outline* outline, |
FT_Pos strength ); |
@@ -525,9 +538,11 @@ FT_BEGIN_HEADER |
* |
* @description: |
* This function analyzes a glyph outline and tries to compute its |
- * fill orientation (see @FT_Orientation). This is done by computing |
- * the direction of each global horizontal and/or vertical extrema |
- * within the outline. |
+ * fill orientation (see @FT_Orientation). This is done by integrating |
+ * the total area covered by the outline. The positive integral |
+ * corresponds to the clockwise orientation and @FT_ORIENTATION_POSTSCRIPT |
+ * is returned. The negative integral corresponds to the counter-clockwise |
+ * orientation and @FT_ORIENTATION_TRUETYPE is returned. |
* |
* Note that this will return @FT_ORIENTATION_TRUETYPE for empty |
* outlines. |
@@ -543,7 +558,6 @@ FT_BEGIN_HEADER |
FT_EXPORT( FT_Orientation ) |
FT_Outline_Get_Orientation( FT_Outline* outline ); |
- |
/* */ |