Index: third_party/freetype/src/truetype/ttdriver.c |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/truetype/ttdriver.c b/third_party/freetype/src/truetype/ttdriver.c |
similarity index 95% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/truetype/ttdriver.c |
rename to third_party/freetype/src/truetype/ttdriver.c |
index 4576ad9b74bb120eb110173054502ea3ed8dc4ce..64e433db02564c942a1c31bb00aaa0089f879cf1 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/truetype/ttdriver.c |
+++ b/third_party/freetype/src/truetype/ttdriver.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* TrueType font driver implementation (body). */ |
/* */ |
-/* Copyright 1996-2013 by */ |
+/* Copyright 1996-2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -16,21 +16,21 @@ |
/***************************************************************************/ |
-#include "../../include/ft2build.h" |
-#include "../../include/freetype/internal/ftdebug.h" |
-#include "../../include/freetype/internal/ftstream.h" |
-#include "../../include/freetype/internal/sfnt.h" |
-#include "../../include/freetype/internal/services/svxf86nm.h" |
+#include <ft2build.h> |
+#include FT_INTERNAL_DEBUG_H |
+#include FT_INTERNAL_STREAM_H |
+#include FT_INTERNAL_SFNT_H |
+#include FT_SERVICE_XFREE86_NAME_H |
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT |
-#include "../../include/freetype/ftmm.h" |
-#include "../../include/freetype/internal/services/svmm.h" |
+#include FT_MULTIPLE_MASTERS_H |
+#include FT_SERVICE_MULTIPLE_MASTERS_H |
#endif |
-#include "../../include/freetype/internal/services/svtteng.h" |
-#include "../../include/freetype/internal/services/svttglyf.h" |
-#include "../../include/freetype/internal/services/svprop.h" |
-#include "../../include/freetype/ftttdrv.h" |
+#include FT_SERVICE_TRUETYPE_ENGINE_H |
+#include FT_SERVICE_TRUETYPE_GLYF_H |
+#include FT_SERVICE_PROPERTIES_H |
+#include FT_TRUETYPE_DRIVER_H |
#include "ttdriver.h" |
#include "ttgload.h" |
@@ -215,7 +215,8 @@ |
FT_UShort ah; |
- TT_Get_VMetrics( face, start + nn, &tsb, &ah ); |
+ /* since we don't need `tsb', we use zero for `yMax' parameter */ |
+ TT_Get_VMetrics( face, start + nn, 0, &tsb, &ah ); |
advances[nn] = ah; |
} |
} |
@@ -266,7 +267,7 @@ |
/* use the scaled metrics, even when tt_size_reset fails */ |
FT_Select_Metrics( size->face, strike_index ); |
- tt_size_reset( ttsize ); |
+ tt_size_reset( ttsize ); /* ignore return value */ |
} |
else |
{ |
@@ -369,7 +370,7 @@ |
return FT_THROW( Invalid_Size_Handle ); |
if ( !face ) |
- return FT_THROW( Invalid_Argument ); |
+ return FT_THROW( Invalid_Face_Handle ); |
#ifdef FT_CONFIG_OPTION_INCREMENTAL |
if ( glyph_index >= (FT_UInt)face->num_glyphs && |
@@ -537,7 +538,7 @@ |
sizeof ( TT_DriverRec ), |
- "truetype_xyq", /* driver name */ |
+ "truetype", /* driver name */ |
0x10000L, /* driver version == 1.0 */ |
0x20000L, /* driver requires FreeType 2.0 or above */ |