ref: af48cb0b9899c9497234198256d50014f59139b8
parent: 2d3e0af942eada7dbfe8475df89f687c3f14cbeb
author: Suzuki, Toshiya (鈴木俊哉) <[email protected]>
date: Sat Oct 4 22:53:06 EDT 2008
src/base/ftobjs.c: Include FT_TRUETYPE_TAGS_H
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-10-05 suzuki toshiya <[email protected]>
+ * 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 <[email protected]>
+
* 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
--- a/include/freetype/tttags.h
+++ b/include/freetype/tttags.h
@@ -92,8 +92,8 @@
#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' )
--- 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