| Index: third_party/freetype/src/type1/t1gload.c
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/type1/t1gload.c b/third_party/freetype/src/type1/t1gload.c
|
| similarity index 97%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/src/type1/t1gload.c
|
| rename to third_party/freetype/src/type1/t1gload.c
|
| index 1f006735daccea2853a42a02f7dd5aa6c99517b1..af102fd85e3437561cb34c1f1b0774ffde883c75 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/src/type1/t1gload.c
|
| +++ b/third_party/freetype/src/type1/t1gload.c
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* Type 1 Glyph Loader (body). */
|
| /* */
|
| -/* Copyright 1996-2006, 2008-2010, 2013 by */
|
| +/* Copyright 1996-2006, 2008-2010, 2013, 2014 by */
|
| /* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| @@ -16,13 +16,13 @@
|
| /***************************************************************************/
|
|
|
|
|
| -#include "../../include/ft2build.h"
|
| +#include <ft2build.h>
|
| #include "t1gload.h"
|
| -#include "../../include/freetype/internal/ftcalc.h"
|
| -#include "../../include/freetype/internal/ftdebug.h"
|
| -#include "../../include/freetype/internal/ftstream.h"
|
| -#include "../../include/freetype/ftoutln.h"
|
| -#include "../../include/freetype/internal/psaux.h"
|
| +#include FT_INTERNAL_CALC_H
|
| +#include FT_INTERNAL_DEBUG_H
|
| +#include FT_INTERNAL_STREAM_H
|
| +#include FT_OUTLINE_H
|
| +#include FT_INTERNAL_POSTSCRIPT_AUX_H
|
|
|
| #include "t1errors.h"
|
|
|
| @@ -194,7 +194,7 @@
|
| for ( glyph_index = 0; glyph_index < type1->num_glyphs; glyph_index++ )
|
| {
|
| /* now get load the unscaled outline */
|
| - error = T1_Parse_Glyph( &decoder, glyph_index );
|
| + (void)T1_Parse_Glyph( &decoder, glyph_index );
|
| if ( glyph_index == 0 || decoder.builder.advance.x > *max_advance )
|
| *max_advance = decoder.builder.advance.x;
|
|
|
| @@ -281,7 +281,7 @@
|
| const T1_Decoder_Funcs decoder_funcs = psaux->t1_decoder_funcs;
|
|
|
| FT_Matrix font_matrix;
|
| - FT_Vector font_offset = {0, 0};
|
| + FT_Vector font_offset;
|
| FT_Data glyph_data;
|
| FT_Bool must_finish_decoder = FALSE;
|
| #ifdef FT_CONFIG_OPTION_INCREMENTAL
|
| @@ -300,6 +300,8 @@
|
| goto Exit;
|
| }
|
|
|
| + FT_TRACE1(( "T1_Load_Glyph: glyph index %d\n", glyph_index ));
|
| +
|
| FT_ASSERT( ( face->len_buildchar == 0 ) == ( face->buildchar == NULL ) );
|
|
|
| if ( load_flags & FT_LOAD_NO_RECURSE )
|
|
|