Commit af48cb0b9899c9497234198256d50014f59139b8
2008-10-05T02:53:06
src/base/ftobjs.c: Include FT_TRUETYPE_TAGS_H
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/ChangeLog b/ChangeLog
index 34a7c62..77ab4df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-10-05 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ * include/freetype/tttags.h: Fix wrong definitions of TTAG_TYP1
+ and TTAG_typ1.
+ * src/base/ftobjs.c: Include FT_TRUETYPE_TAGS_H.
+
+2008-10-05 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
* src/sfnt/sfobjs.c (sfnt_open_font): Allow 'typ1' version
tag in the beginning of sfnt container.
* src/sfnt/ttload.c (check_table_dir): Return
diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h
index 1c6fe1d..4d344be 100644
--- a/include/freetype/tttags.h
+++ b/include/freetype/tttags.h
@@ -92,8 +92,8 @@ FT_BEGIN_HEADER
#define TTAG_true FT_MAKE_TAG( 't', 'r', 'u', 'e' )
#define TTAG_ttc FT_MAKE_TAG( 't', 't', 'c', ' ' )
#define TTAG_ttcf FT_MAKE_TAG( 't', 't', 'c', 'f' )
-#define TTAG_ttcf FT_MAKE_TAG( 'T', 'Y', 'P', '1' )
-#define TTAG_ttcf FT_MAKE_TAG( 't', 'y', 'p', '1' )
+#define TTAG_TYP1 FT_MAKE_TAG( 'T', 'Y', 'P', '1' )
+#define TTAG_typ1 FT_MAKE_TAG( 't', 'y', 'p', '1' )
#define TTAG_VDMX FT_MAKE_TAG( 'V', 'D', 'M', 'X' )
#define TTAG_vhea FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
#define TTAG_vmtx FT_MAKE_TAG( 'v', 'm', 't', 'x' )
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index fa5f5c8..cfd9ad7 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -26,6 +26,7 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_SFNT_H /* for SFNT_Load_Table_Func */
#include FT_TRUETYPE_TABLES_H
+#include FT_TRUETYPE_TAGS_H
#include FT_TRUETYPE_IDS_H
#include FT_OUTLINE_H