From 306761dc9a8fa45449d3ae0d7d46e170de9eee95 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 26 Jan 2004 19:24:00 +0000 Subject: Suport CFF fonts as well. (#131202, Manjunath Sripadarao) Mon Jan 26 14:20:34 2004 Owen Taylor * pango/opentype/pango-ot-info.c (is_truetype): Suport CFF fonts as well. (#131202, Manjunath Sripadarao) --- ChangeLog | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-4 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ pango/opentype/pango-ot-info.c | 3 ++- 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6762d207..6f95ae2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 26 14:20:34 2004 Owen Taylor + + * pango/opentype/pango-ot-info.c (is_truetype): Suport + CFF fonts as well. (#131202, Manjunath Sripadarao) + 2003-12-08 Tor Lillqvist * modules/basic/basic-win32.c (convert_log_clusters_to_byte_offsets): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 6762d207..6f95ae2e 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Mon Jan 26 14:20:34 2004 Owen Taylor + + * pango/opentype/pango-ot-info.c (is_truetype): Suport + CFF fonts as well. (#131202, Manjunath Sripadarao) + 2003-12-08 Tor Lillqvist * modules/basic/basic-win32.c (convert_log_clusters_to_byte_offsets): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 6762d207..6f95ae2e 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Mon Jan 26 14:20:34 2004 Owen Taylor + + * pango/opentype/pango-ot-info.c (is_truetype): Suport + CFF fonts as well. (#131202, Manjunath Sripadarao) + 2003-12-08 Tor Lillqvist * modules/basic/basic-win32.c (convert_log_clusters_to_byte_offsets): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 6762d207..6f95ae2e 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Mon Jan 26 14:20:34 2004 Owen Taylor + + * pango/opentype/pango-ot-info.c (is_truetype): Suport + CFF fonts as well. (#131202, Manjunath Sripadarao) + 2003-12-08 Tor Lillqvist * modules/basic/basic-win32.c (convert_log_clusters_to_byte_offsets): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 6762d207..6f95ae2e 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Mon Jan 26 14:20:34 2004 Owen Taylor + + * pango/opentype/pango-ot-info.c (is_truetype): Suport + CFF fonts as well. (#131202, Manjunath Sripadarao) + 2003-12-08 Tor Lillqvist * modules/basic/basic-win32.c (convert_log_clusters_to_byte_offsets): diff --git a/pango/opentype/pango-ot-info.c b/pango/opentype/pango-ot-info.c index 9a875459..578c95d1 100644 --- a/pango/opentype/pango-ot-info.c +++ b/pango/opentype/pango-ot-info.c @@ -137,7 +137,8 @@ pango_ot_info_get (FT_Face face) static gboolean is_truetype (FT_Face face) { - return strcmp (FT_MODULE_CLASS (face->driver)->module_name, "truetype") == 0; + return strcmp (FT_MODULE_CLASS (face->driver)->module_name, "truetype") == 0 || + strcmp (FT_MODULE_CLASS (face->driver)->module_name, "cff") == 0; } typedef struct _GlyphInfo GlyphInfo; -- cgit v1.2.1