Index: third_party/freetype/src/sfnt/sfdriver.c |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/sfdriver.c b/third_party/freetype/src/sfnt/sfdriver.c |
similarity index 92% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/sfdriver.c |
rename to third_party/freetype/src/sfnt/sfdriver.c |
index 175838348dec0174093f154fa4fb03df23012b02..bd8dd2e57182d0c227b8206a2c51a83f17bf43f8 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/sfdriver.c |
+++ b/third_party/freetype/src/sfnt/sfdriver.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* High-level SFNT driver interface (body). */ |
/* */ |
-/* Copyright 1996-2007, 2009-2013 by */ |
+/* Copyright 1996-2007, 2009-2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -16,10 +16,10 @@ |
/***************************************************************************/ |
-#include "../../include/ft2build.h" |
-#include "../../include/freetype/internal/ftdebug.h" |
-#include "../../include/freetype/internal/sfnt.h" |
-#include "../../include/freetype/internal/ftobjs.h" |
+#include <ft2build.h> |
+#include FT_INTERNAL_DEBUG_H |
+#include FT_INTERNAL_SFNT_H |
+#include FT_INTERNAL_OBJECTS_H |
#include "sfdriver.h" |
#include "ttload.h" |
@@ -38,17 +38,17 @@ |
#ifdef TT_CONFIG_OPTION_BDF |
#include "ttbdf.h" |
-#include "../../include/freetype/internal/services/svbdf.h" |
+#include FT_SERVICE_BDF_H |
#endif |
#include "ttcmap.h" |
#include "ttkern.h" |
#include "ttmtx.h" |
-#include "../../include/freetype/internal/services/svgldict.h" |
-#include "../../include/freetype/internal/services/svpostnm.h" |
-#include "../../include/freetype/internal/services/svsfnt.h" |
-#include "../../include/freetype/internal/services/svttcmap.h" |
+#include FT_SERVICE_GLYPH_DICT_H |
+#include FT_SERVICE_POSTSCRIPT_NAME_H |
+#include FT_SERVICE_SFNT_H |
+#include FT_SERVICE_TT_CMAP_H |
/*************************************************************************/ |
@@ -75,36 +75,36 @@ |
switch ( tag ) |
{ |
- case ft_sfnt_head: |
+ case FT_SFNT_HEAD: |
table = &face->header; |
break; |
- case ft_sfnt_hhea: |
+ case FT_SFNT_HHEA: |
table = &face->horizontal; |
break; |
- case ft_sfnt_vhea: |
- table = face->vertical_info ? &face->vertical : 0; |
+ case FT_SFNT_VHEA: |
+ table = face->vertical_info ? &face->vertical : NULL; |
break; |
- case ft_sfnt_os2: |
- table = face->os2.version == 0xFFFFU ? 0 : &face->os2; |
+ case FT_SFNT_OS2: |
+ table = face->os2.version == 0xFFFFU ? NULL : &face->os2; |
break; |
- case ft_sfnt_post: |
+ case FT_SFNT_POST: |
table = &face->postscript; |
break; |
- case ft_sfnt_maxp: |
+ case FT_SFNT_MAXP: |
table = &face->max_profile; |
break; |
- case ft_sfnt_pclt: |
- table = face->pclt.Version ? &face->pclt : 0; |
+ case FT_SFNT_PCLT: |
+ table = face->pclt.Version ? &face->pclt : NULL; |
break; |
default: |
- table = 0; |
+ table = NULL; |
} |
return table; |
@@ -266,7 +266,7 @@ |
{ |
FT_Stream stream = face->name_table.stream; |
FT_String* r = (FT_String*)result; |
- FT_Byte* p = (FT_Byte*)name->string; |
+ FT_Byte* p; |
if ( FT_STREAM_SEEK( name->stringOffset ) || |
@@ -499,8 +499,8 @@ |
tt_face_load_hmtx, |
/* see `ttsbit.h' and `sfnt.h' */ |
- PUT_EMBEDDED_BITMAPS( tt_face_load_eblc ), |
- PUT_EMBEDDED_BITMAPS( tt_face_free_eblc ), |
+ PUT_EMBEDDED_BITMAPS( tt_face_load_sbit ), |
+ PUT_EMBEDDED_BITMAPS( tt_face_free_sbit ), |
PUT_EMBEDDED_BITMAPS( tt_face_set_sbit_strike ), |
PUT_EMBEDDED_BITMAPS( tt_face_load_strike_metrics ), |