Index: third_party/freetype/src/psaux/t1decode.c |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/t1decode.c b/third_party/freetype/src/psaux/t1decode.c |
similarity index 99% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/t1decode.c |
rename to third_party/freetype/src/psaux/t1decode.c |
index abf1d741519b1abaf4c62ecfb06b8bc661297e6b..d67a05ebca8bc81d7ef34ab38ccf6e303709e0e3 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/t1decode.c |
+++ b/third_party/freetype/src/psaux/t1decode.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* PostScript Type 1 decoding routines (body). */ |
/* */ |
-/* Copyright 2000-2013 by */ |
+/* Copyright 2000-2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -16,11 +16,11 @@ |
/***************************************************************************/ |
-#include "../../include/ft2build.h" |
-#include "../../include/freetype/internal/ftcalc.h" |
-#include "../../include/freetype/internal/ftdebug.h" |
-#include "../../include/freetype/internal/pshints.h" |
-#include "../../include/freetype/ftoutln.h" |
+#include <ft2build.h> |
+#include FT_INTERNAL_CALC_H |
+#include FT_INTERNAL_DEBUG_H |
+#include FT_INTERNAL_POSTSCRIPT_HINTS_H |
+#include FT_OUTLINE_H |
#include "t1decode.h" |
#include "psobjs.h" |
@@ -1098,10 +1098,12 @@ |
goto Syntax_Error; |
/* apply hints to the loaded glyph outline now */ |
- hinter->apply( hinter->hints, |
- builder->current, |
- (PSH_Globals)builder->hints_globals, |
- decoder->hint_mode ); |
+ error = hinter->apply( hinter->hints, |
+ builder->current, |
+ (PSH_Globals)builder->hints_globals, |
+ decoder->hint_mode ); |
+ if ( error ) |
+ goto Fail; |
} |
/* add current outline to the glyph slot */ |