From af48cb0b9899c9497234198256d50014f59139b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suzuki=2C=20Toshiya=20=28=E9=88=B4=E6=9C=A8=E4=BF=8A?= =?UTF-8?q?=E5=93=89=29?= Date: Sun, 5 Oct 2008 02:53:06 +0000 Subject: [PATCH] src/base/ftobjs.c: Include FT_TRUETYPE_TAGS_H --- ChangeLog | 6 ++++++ include/freetype/tttags.h | 4 ++-- src/base/ftobjs.c | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34a7c6217..77ab4df2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-10-05 suzuki toshiya + + * 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 * src/sfnt/sfobjs.c (sfnt_open_font): Allow 'typ1' version diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h index 1c6fe1d5e..4d344be33 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 fa5f5c83e..cfd9ad720 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