From: eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 6 Mar 2007 09:59:53 +0000 (+0000)
Subject: Text alignment should not use bounding boxes of individual glyphs.
X-Git-Tag: 0.9.7~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b48fb88484603d7445f02265a4f3defe1f1165b;p=libass

Text alignment should not use bounding boxes of individual glyphs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22474 b3059339-0415-0410-9bf9-f77b7e298cf2
---

diff --git a/libass/ass_render.c b/libass/ass_render.c
index 6f60a32..c240e65 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -1803,16 +1803,16 @@ static int ass_render_event(ass_event_t* event, event_images_t* event_images)
 		last_break = -1;
 		for (i = 1; i < text_info.length + 1; ++i) { // (text_info.length + 1) is the end of the last line
 			if ((i == text_info.length) || text_info.glyphs[i].linebreak) {
-				int width, shift;
+				int width, shift = 0;
 				glyph_info_t* first_glyph = text_info.glyphs + last_break + 1;
 				glyph_info_t* last_glyph = text_info.glyphs + i - 1;
 
 				while ((last_glyph > first_glyph) && ((last_glyph->symbol == '\n') || (last_glyph->symbol == 0)))
 					last_glyph --;
 
-				width = last_glyph->pos.x + last_glyph->bbox.xMax - first_glyph->pos.x - first_glyph->bbox.xMin;
-				shift = - first_glyph->bbox.xMin; // now text line starts exactly at 0 (left margin)
+				width = last_glyph->pos.x + d6_to_int(last_glyph->advance.x) - first_glyph->pos.x;
 				if (halign == HALIGN_LEFT) { // left aligned, no action
+					shift = 0;
 				} else if (halign == HALIGN_RIGHT) { // right aligned
 					shift = max_text_width - width;
 				} else if (halign == HALIGN_CENTER) { // centered