(x_get_glyph_overhangs): Fix calculation of right

overhang for the static composition case.

(x_get_glyph_overhangs): Fix calculation of right
overhang for the static composition case.
5753e4da · Kenichi Handa · a431c5f4 · 5753e4da · 5753e4da
Commit 5753e4da authored Jun 11, 2009 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

src/ChangeLog src/ChangeLog +8 -0

src/xdisp.c src/xdisp.c +3 -3

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2009-06-11  Kenichi Handa  <handa@m17n.org>
+
+	* xdisp.c (x_get_glyph_overhangs): Fix calculation of right
+	overhang for the static composition case.
+
 2009-06-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
  
+	* xdisp.c (x_get_glyph_overhangs): Fix calculation of right
+	overhang for the automatic composition case.
+
 	* xterm.c (x_compute_glyph_string_overhangs): Handle the automatic
 	composition case.
  

--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19913,10 +19913,10 @@ x_get_glyph_overhangs (glyph, f, left, right)
 	{
 	  struct composition *cmp = composition_table[glyph->u.cmp.id];
  
-	  if (cmp->rbearing - cmp->pixel_width)
+	  if (cmp->rbearing > cmp->pixel_width)
 	    *right = cmp->rbearing - cmp->pixel_width;
-	  if (cmp->lbearing < 0);
-	  *left = - cmp->lbearing;
+	  if (cmp->lbearing < 0)
+	    *left = - cmp->lbearing;
 	}
      else
 	{