michael@0: diff --git a/gfx/cairo/cairo/src/cairo-win32-font.c b/gfx/cairo/cairo/src/cairo-win32-font.c
michael@0: --- a/gfx/cairo/cairo/src/cairo-win32-font.c
michael@0: +++ b/gfx/cairo/cairo/src/cairo-win32-font.c
michael@0: @@ -986,6 +986,19 @@ _cairo_win32_scaled_font_init_glyph_metr
michael@0:  			      &metrics, 0, NULL, &matrix) == GDI_ERROR) {
michael@0:  	  status = _cairo_win32_print_gdi_error ("_cairo_win32_scaled_font_init_glyph_metrics:GetGlyphOutlineW");
michael@0:  	  memset (&metrics, 0, sizeof (GLYPHMETRICS));
michael@0: +	} else {
michael@0: +	    if (metrics.gmBlackBoxX > 0 && scaled_font->base.options.antialias != CAIRO_ANTIALIAS_NONE) {
michael@0: +		/* The bounding box reported by Windows supposedly contains the glyph's "black" area;
michael@0: +		 * however, antialiasing (especially with ClearType) means that the actual image that
michael@0: +		 * needs to be rendered may "bleed" into the adjacent pixels, mainly on the right side.
michael@0: +		 * To avoid clipping the glyphs when drawn by _cairo_surface_fallback_show_glyphs,
michael@0: +		 * for example, or other code that uses glyph extents to determine the area to update,
michael@0: +		 * we add a pixel of "slop" to left side of the nominal "black" area returned by GDI,
michael@0: +		 * and two pixels to the right (as tests show some glyphs bleed into this column).
michael@0: +		 */
michael@0: +		metrics.gmptGlyphOrigin.x -= 1;
michael@0: +		metrics.gmBlackBoxX += 3;
michael@0: +	    }
michael@0:  	}
michael@0:  	cairo_win32_scaled_font_done_font (&scaled_font->base);
michael@0:  	if (status)