| Index: third_party/freetype/include/internal/ftrfork.h
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/ftrfork.h b/third_party/freetype/include/internal/ftrfork.h
|
| similarity index 94%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/ftrfork.h
|
| rename to third_party/freetype/include/internal/ftrfork.h
|
| index 061124b130247fe956af9501ef6a373b54d0e61c..d750cbefd8331a5558493fbc378f2f4f9eb10070 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/ftrfork.h
|
| +++ b/third_party/freetype/include/internal/ftrfork.h
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* Embedded resource forks accessor (specification). */
|
| /* */
|
| -/* Copyright 2004, 2006, 2007, 2012 by */
|
| +/* Copyright 2004, 2006, 2007, 2012, 2013 by */
|
| /* Masatake YAMATO and Redhat K.K. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| @@ -25,8 +25,8 @@
|
| #define __FTRFORK_H__
|
|
|
|
|
| -#include "../../ft2build.h"
|
| -#include "ftobjs.h"
|
| +#include <ft2build.h>
|
| +#include FT_INTERNAL_OBJECTS_H
|
|
|
|
|
| FT_BEGIN_HEADER
|
| @@ -94,7 +94,7 @@ FT_BEGIN_HEADER
|
| /* this array is a function in PIC mode, so no ; is needed in END */
|
| #define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \
|
| void \
|
| - FT_Init_ ## name( type* storage ) \
|
| + FT_Init_Table_ ## name( type* storage ) \
|
| { \
|
| type* local = storage; \
|
| \
|
| @@ -224,6 +224,13 @@ FT_BEGIN_HEADER
|
| /* tag :: */
|
| /* The resource tag. */
|
| /* */
|
| + /* sort_by_res_id :: */
|
| + /* A Boolean to sort the fragmented resource by their ids. */
|
| + /* The fragmented resources for `POST' resource should be sorted */
|
| + /* to restore Type1 font properly. For `snft' resources, sorting */
|
| + /* may induce a different order of the faces in comparison to that */
|
| + /* by QuickDraw API. */
|
| + /* */
|
| /* <Output> */
|
| /* offsets :: */
|
| /* The stream offsets for the resource data specified by `tag'. */
|
| @@ -246,6 +253,7 @@ FT_BEGIN_HEADER
|
| FT_Long map_offset,
|
| FT_Long rdata_pos,
|
| FT_Long tag,
|
| + FT_Bool sort_by_res_id,
|
| FT_Long **offsets,
|
| FT_Long *count );
|
|
|
|
|