summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-01-26 19:24:00 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-01-26 19:24:00 +0000
commit306761dc9a8fa45449d3ae0d7d46e170de9eee95 (patch)
treebac643159dc9bee7a36e558232daca55506f272e
parent3dbcaa65747339795ae26feffeae56c9c73ac764 (diff)
downloadpango-306761dc9a8fa45449d3ae0d7d46e170de9eee95.tar.gz
Suport CFF fonts as well. (#131202, Manjunath Sripadarao)
Mon Jan 26 14:20:34 2004 Owen Taylor <otaylor@redhat.com> * pango/opentype/pango-ot-info.c (is_truetype): Suport CFF fonts as well. (#131202, Manjunath Sripadarao)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/opentype/pango-ot-info.c3
6 files changed, 27 insertions, 1 deletions
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 <otaylor@redhat.com>
+
+ * pango/opentype/pango-ot-info.c (is_truetype): Suport
+ CFF fonts as well. (#131202, Manjunath Sripadarao)
+
2003-12-08 Tor Lillqvist <tml@iki.fi>
* 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 <otaylor@redhat.com>
+
+ * pango/opentype/pango-ot-info.c (is_truetype): Suport
+ CFF fonts as well. (#131202, Manjunath Sripadarao)
+
2003-12-08 Tor Lillqvist <tml@iki.fi>
* 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 <otaylor@redhat.com>
+
+ * pango/opentype/pango-ot-info.c (is_truetype): Suport
+ CFF fonts as well. (#131202, Manjunath Sripadarao)
+
2003-12-08 Tor Lillqvist <tml@iki.fi>
* 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 <otaylor@redhat.com>
+
+ * pango/opentype/pango-ot-info.c (is_truetype): Suport
+ CFF fonts as well. (#131202, Manjunath Sripadarao)
+
2003-12-08 Tor Lillqvist <tml@iki.fi>
* 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 <otaylor@redhat.com>
+
+ * pango/opentype/pango-ot-info.c (is_truetype): Suport
+ CFF fonts as well. (#131202, Manjunath Sripadarao)
+
2003-12-08 Tor Lillqvist <tml@iki.fi>
* 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;