src/base/ftobjs.c: Include FT_TRUETYPE_TAGS_H

ChangeLog

@@ -1,3 +1,9 @@
+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

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' )

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