gfx/cairo/win32-canvas-glyph-position.patch
author Tanner M. Young <mozilla.bugs@alyoung.com>
Sat, 17 Oct 2009 10:07:27 +0200
changeset 33980 72074ac5a64e50c97d0092adaf8ce124dfad1172
parent 24334 360b4a2d0aa8fa46670fd304276cfab140bbdabf
permissions -rw-r--r--
Bug 432118 - "My Yahoo" should be "My Yahoo!" in the list of feed handlers. r=sayrer

diff --git a/gfx/cairo/cairo/src/cairo-win32-font.c b/gfx/cairo/cairo/src/cairo-win32-font.c
--- a/gfx/cairo/cairo/src/cairo-win32-font.c
+++ b/gfx/cairo/cairo/src/cairo-win32-font.c
@@ -1182,22 +1182,22 @@ _add_glyph (cairo_glyph_state_t *state,
     if (state->glyphs.num_elements > 0) {
 	int dx;
 
 	if (logical_y != state->last_y) {
 	    status = _flush_glyphs (state);
 	    if (status)
 		return status;
 	    state->start_x = logical_x;
+	} else {
+	    dx = logical_x - state->last_x;
+	    status = _cairo_array_append (&state->dx, &dx);
+	    if (status)
+		return status;
 	}
-
-	dx = logical_x - state->last_x;
-	status = _cairo_array_append (&state->dx, &dx);
-	if (status)
-	    return status;
     } else {
 	state->start_x = logical_x;
     }
 
     state->last_x = logical_x;
     state->last_y = logical_y;
 
     status = _cairo_array_append (&state->glyphs, &glyph_index);