Index: third_party/freetype/include/internal/ftobjs.h |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/ftobjs.h b/third_party/freetype/include/internal/ftobjs.h |
similarity index 99% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/ftobjs.h |
rename to third_party/freetype/include/internal/ftobjs.h |
index d6f7de3dc9cbcb94ba27b9a6ccf2f7f7067665d5..b45a5ed814f622e743d81c86f09c9292841d9f27 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/ftobjs.h |
+++ b/third_party/freetype/include/internal/ftobjs.h |
@@ -26,19 +26,19 @@ |
#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 |
@@ -72,6 +72,16 @@ FT_BEGIN_HEADER |
#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 ) |
@@ -83,14 +93,6 @@ FT_BEGIN_HEADER |
/* |
- * 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 |