summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2008-08-06 08:40:12 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2008-08-06 08:40:12 +0000
commit7c21c1a52489fab823fd95e7f3082280e973a13e (patch)
treef70e08070b806ae1977f87944cbd2e5031679809
parenta29377c7a5ceffc53a2a651faa2d099701b4e53e (diff)
downloadpango-7c21c1a52489fab823fd95e7f3082280e973a13e.tar.gz
Bug 441654 – prefix fails when more than one base characters (as
2008-08-06 Behdad Esfahbod <behdad@gnome.org> Bug 441654 – prefix fails when more than one base characters (as conjuncts) present after a half form the next prefix renders incorrectly Patch from Rahul Bhalerao * modules/indic/mprefixups.c (indic_mprefixups_apply): Do what I was told to do. svn path=/trunk/; revision=2682
-rw-r--r--ChangeLog10
-rw-r--r--modules/indic/mprefixups.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 77cc1ead..8a031b90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2008-08-06 Behdad Esfahbod <behdad@gnome.org>
+ Bug 441654 – prefix fails when more than one base characters (as
+ conjuncts) present after a half form the next prefix renders
+ incorrectly
+ Patch from Rahul Bhalerao
+
+ * modules/indic/mprefixups.c (indic_mprefixups_apply):
+ Do what I was told to do.
+
+2008-08-06 Behdad Esfahbod <behdad@gnome.org>
+
Bug 546534 – pango_cairo_font_map_set_default(NULL) errs
* pango/pangocairo-fontmap.c (pango_cairo_font_map_set_default):
diff --git a/modules/indic/mprefixups.c b/modules/indic/mprefixups.c
index 4acb6d09..a599e6d6 100644
--- a/modules/indic/mprefixups.c
+++ b/modules/indic/mprefixups.c
@@ -81,7 +81,7 @@ void indic_mprefixups_apply(MPreFixups *mprefixups, PangoOTBuffer *buffer)
pango_ot_buffer_get_glyphs (buffer, &glyphs, &n_glyphs);
for (i = 0; i < n_glyphs; i++) {
- if (baseGlyph < 0 && glyphs[i].cluster == baseIndex)
+ if ((baseIndex >= glyphs[i].cluster) && (baseIndex-glyphs[i].cluster) % 2 == 0) /* bug 441654 */
baseGlyph = i;
if (glyphs[i].cluster == mpreIndex) {
if (mpreGlyph < 0)