Bug 587318: Only pad horizontal glyph metrics. r=jdaggett
authorBas Schouten <bschouten@mozilla.com>
Mon, 16 Aug 2010 09:15:03 +0200
changeset 50654 16aa8f0aa149a86158961ebbc23a9cbe5f990464
parent 50653 0fb6352dc09cc885d0345c4c5689ccb4b38d471d
child 50655 2a04d4e8ba195563fdf55fa1e75cddf8278ba8d6
push idunknown
push userunknown
push dateunknown
reviewersjdaggett
bugs587318
milestone2.0b4pre
Bug 587318: Only pad horizontal glyph metrics. r=jdaggett
gfx/cairo/cairo/src/cairo-dwrite-font.cpp
--- a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
+++ b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
@@ -599,18 +599,16 @@ cairo_int_status_t
 
     // We pad the extents here because GetDesignGlyphMetrics returns "ideal" metrics
     // for the glyph outline, without accounting for hinting/gridfitting/antialiasing,
     // and therefore it does not always cover all pixels that will actually be touched.
     if (scaled_font->base.options.antialias != CAIRO_ANTIALIAS_NONE &&
         extents.width > 0 && extents.height > 0) {
         extents.width += scaled_font->mat_inverse.xx * 2;
         extents.x_bearing -= scaled_font->mat_inverse.xx;
-        extents.height += scaled_font->mat_inverse.yy * 2;
-        extents.y_bearing -= scaled_font->mat_inverse.yy;
     }
 
     _cairo_scaled_glyph_set_metrics (scaled_glyph,
 				     &scaled_font->base,
 				     &extents);
     return CAIRO_INT_STATUS_SUCCESS;
 }