Index: third_party/freetype/src/psaux/t1cmap.c |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/t1cmap.c b/third_party/freetype/src/psaux/t1cmap.c |
similarity index 95% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/t1cmap.c |
rename to third_party/freetype/src/psaux/t1cmap.c |
index 4070306c52ce4b1e565f5614bc476590c482f68b..fb1353ae0fd466896d364ab05de02786127e08de 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/t1cmap.c |
+++ b/third_party/freetype/src/psaux/t1cmap.c |
@@ -18,7 +18,7 @@ |
#include "t1cmap.h" |
-#include "../../include/freetype/internal/ftdebug.h" |
+#include FT_INTERNAL_DEBUG_H |
#include "psauxerr.h" |
@@ -120,8 +120,12 @@ |
FT_CALLBACK_DEF( FT_Error ) |
- t1_cmap_standard_init( T1_CMapStd cmap ) |
+ t1_cmap_standard_init( T1_CMapStd cmap, |
+ FT_Pointer pointer ) |
{ |
+ FT_UNUSED( pointer ); |
+ |
+ |
t1_cmap_std_init( cmap, 0 ); |
return 0; |
} |
@@ -142,8 +146,12 @@ |
FT_CALLBACK_DEF( FT_Error ) |
- t1_cmap_expert_init( T1_CMapStd cmap ) |
+ t1_cmap_expert_init( T1_CMapStd cmap, |
+ FT_Pointer pointer ) |
{ |
+ FT_UNUSED( pointer ); |
+ |
+ |
t1_cmap_std_init( cmap, 1 ); |
return 0; |
} |
@@ -172,11 +180,14 @@ |
FT_CALLBACK_DEF( FT_Error ) |
- t1_cmap_custom_init( T1_CMapCustom cmap ) |
+ t1_cmap_custom_init( T1_CMapCustom cmap, |
+ FT_Pointer pointer ) |
{ |
T1_Face face = (T1_Face)FT_CMAP_FACE( cmap ); |
T1_Encoding encoding = &face->type1.encoding; |
+ FT_UNUSED( pointer ); |
+ |
cmap->first = encoding->code_first; |
cmap->count = (FT_UInt)( encoding->code_last - cmap->first ); |
@@ -272,12 +283,15 @@ |
FT_CALLBACK_DEF( FT_Error ) |
- t1_cmap_unicode_init( PS_Unicodes unicodes ) |
+ t1_cmap_unicode_init( PS_Unicodes unicodes, |
+ FT_Pointer pointer ) |
{ |
T1_Face face = (T1_Face)FT_CMAP_FACE( unicodes ); |
FT_Memory memory = FT_FACE_MEMORY( face ); |
FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)face->psnames; |
+ FT_UNUSED( pointer ); |
+ |
return psnames->unicodes_init( memory, |
unicodes, |