diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 4 | ||||
| -rw-r--r-- | examples/Makefile.am | 1 | ||||
| -rw-r--r-- | pango/pangoxft-font.c | 38 |
9 files changed, 55 insertions, 12 deletions
@@ -1,3 +1,7 @@ +Thu Mar 14 20:02:58 2002 Owen Taylor <otaylor@redhat.com> + + * examples/Makefile.am (EXTRA_DIST): Remove moc_view-qt.cc. (#74725) + Wed Mar 13 10:31:07 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_max): Fix typo diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index fc7c22a2..cb3df776 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,7 @@ +Thu Mar 14 20:02:58 2002 Owen Taylor <otaylor@redhat.com> + + * examples/Makefile.am (EXTRA_DIST): Remove moc_view-qt.cc. (#74725) + Wed Mar 13 10:31:07 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_max): Fix typo diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index fc7c22a2..cb3df776 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,7 @@ +Thu Mar 14 20:02:58 2002 Owen Taylor <otaylor@redhat.com> + + * examples/Makefile.am (EXTRA_DIST): Remove moc_view-qt.cc. (#74725) + Wed Mar 13 10:31:07 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_max): Fix typo diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index fc7c22a2..cb3df776 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,7 @@ +Thu Mar 14 20:02:58 2002 Owen Taylor <otaylor@redhat.com> + + * examples/Makefile.am (EXTRA_DIST): Remove moc_view-qt.cc. (#74725) + Wed Mar 13 10:31:07 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_max): Fix typo diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index fc7c22a2..cb3df776 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,7 @@ +Thu Mar 14 20:02:58 2002 Owen Taylor <otaylor@redhat.com> + + * examples/Makefile.am (EXTRA_DIST): Remove moc_view-qt.cc. (#74725) + Wed Mar 13 10:31:07 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_max): Fix typo diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index fc7c22a2..cb3df776 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,7 @@ +Thu Mar 14 20:02:58 2002 Owen Taylor <otaylor@redhat.com> + + * examples/Makefile.am (EXTRA_DIST): Remove moc_view-qt.cc. (#74725) + Wed Mar 13 10:31:07 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_max): Fix typo diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index fc7c22a2..cb3df776 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,7 @@ +Thu Mar 14 20:02:58 2002 Owen Taylor <otaylor@redhat.com> + + * examples/Makefile.am (EXTRA_DIST): Remove moc_view-qt.cc. (#74725) + Wed Mar 13 10:31:07 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_max): Fix typo diff --git a/examples/Makefile.am b/examples/Makefile.am index 8c2aea8e..06e1eeb7 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -61,7 +61,6 @@ pango.modules: fi EXTRA_DIST= \ - moc_viewer-qt.cc \ viewer-qt.cc \ viewer-qt.h \ viewer-win32.c \ diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 30246d39..6600bd78 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -456,7 +456,6 @@ pango_xft_font_get_coverage (PangoFont *font, FT_Face face; PangoCoverage *coverage; Display *display; - int i; _pango_xft_font_map_get_info (xfont->fontmap, &display, NULL); @@ -467,21 +466,38 @@ pango_xft_font_get_coverage (PangoFont *font, if (coverage) return pango_coverage_ref (coverage); - /* Ugh, this is going to be SLOW */ - face = pango_xft_font_get_face (font); coverage = pango_coverage_new (); - for (i = 0; i < G_MAXUSHORT; i++) - { - FT_UInt glyph = FT_Get_Char_Index (face, i); - - if (glyph && glyph < face->num_glyphs) - pango_coverage_set (coverage, i, PANGO_COVERAGE_EXACT); - } +#ifdef HAVE_FT_GET_FIRST_CHAR + { + FT_ULong gindex; + FT_Ulong charcode; + + charcode = FT_Get_First_Char (face, &gindex); + while (gindex) + { + pango_coverage_set (coverage, charcode, PANGO_COVERAGE_EXACT); + charcode = FT_Get_Next_Char (face, charcode, &gindex); + } + } +#else + /* Ugh, this is going to be SLOW */ + { + int i; + + for (i = 0; i < G_MAXUSHORT; i++) + { + FT_UInt glyph = FT_Get_Char_Index (face, i); + + if (glyph && glyph < face->num_glyphs) + pango_coverage_set (coverage, i, PANGO_COVERAGE_EXACT); + } + } +#endif _pango_xft_font_map_set_coverage (xfont->fontmap, filename, coverage); - + return coverage; } |