Index: third_party/freetype/src/truetype/ttgxvar.c |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/truetype/ttgxvar.c b/third_party/freetype/src/truetype/ttgxvar.c |
similarity index 99% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/truetype/ttgxvar.c |
rename to third_party/freetype/src/truetype/ttgxvar.c |
index 559e63237a3f17308ff6ca14e952dc83be6d7615..1b35539fe1371eee9e938a7792438371abae7729 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/truetype/ttgxvar.c |
+++ b/third_party/freetype/src/truetype/ttgxvar.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* TrueType GX Font Variation loader */ |
/* */ |
-/* Copyright 2004-2013 by */ |
+/* Copyright 2004-2014 by */ |
/* David Turner, Robert Wilhelm, Werner Lemberg, and George Williams. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -43,13 +43,13 @@ |
/*************************************************************************/ |
-#include "../../include/ft2build.h" |
-#include "../../include/freetype/internal/ftdebug.h" |
-#include "../../include/freetype/config/ftconfig.h" |
-#include "../../include/freetype/internal/ftstream.h" |
-#include "../../include/freetype/internal/sfnt.h" |
-#include "../../include/freetype/tttags.h" |
-#include "../../include/freetype/ftmm.h" |
+#include <ft2build.h> |
+#include FT_INTERNAL_DEBUG_H |
+#include FT_CONFIG_CONFIG_H |
+#include FT_INTERNAL_STREAM_H |
+#include FT_INTERNAL_SFNT_H |
+#include FT_TRUETYPE_TAGS_H |
+#include FT_MULTIPLE_MASTERS_H |
#include "ttpload.h" |
#include "ttgxvar.h" |
@@ -938,13 +938,13 @@ |
FT_FREE( face->cvt ); |
face->cvt = NULL; |
- tt_face_load_cvt( face, face->root.stream ); |
+ error = tt_face_load_cvt( face, face->root.stream ); |
break; |
case mcvt_modify: |
/* The original cvt table is in memory. All we need to do is */ |
/* apply the `cvar' table (if any). */ |
- tt_face_vary_cvt( face, face->root.stream ); |
+ error = tt_face_vary_cvt( face, face->root.stream ); |
break; |
case mcvt_retain: |