зеркало из https://github.com/mozilla/pjs.git
Bug 297705 - correct cairo_text_extents() on win32 for general transforms.
r=otaylor, r+a=shaver.
This commit is contained in:
Родитель
57656307a6
Коммит
a60f1bd6e0
|
@ -30,3 +30,7 @@ PATCHES:
|
||||||
|
|
||||||
optimize-opaque-paint.diff - if cairo_paint_with_alpha is called
|
optimize-opaque-paint.diff - if cairo_paint_with_alpha is called
|
||||||
with alpha == 1.0, turn it into cairo_paint
|
with alpha == 1.0, turn it into cairo_paint
|
||||||
|
|
||||||
|
win32-extents.diff - correct text extents for general tranforms
|
||||||
|
(upstream patch)
|
||||||
|
|
||||||
|
|
|
@ -714,7 +714,7 @@ _cairo_win32_scaled_font_glyph_extents (void *abstract_font,
|
||||||
_cairo_win32_scaled_font_done_unscaled_font (&scaled_font->base);
|
_cairo_win32_scaled_font_done_unscaled_font (&scaled_font->base);
|
||||||
|
|
||||||
extents->x_bearing = (double)metrics.gmptGlyphOrigin.x / scaled_font->em_square;
|
extents->x_bearing = (double)metrics.gmptGlyphOrigin.x / scaled_font->em_square;
|
||||||
extents->y_bearing = (double)metrics.gmptGlyphOrigin.y / scaled_font->em_square;
|
extents->y_bearing = - (double)metrics.gmptGlyphOrigin.y / scaled_font->em_square;
|
||||||
extents->width = (double)metrics.gmBlackBoxX / scaled_font->em_square;
|
extents->width = (double)metrics.gmBlackBoxX / scaled_font->em_square;
|
||||||
extents->height = (double)metrics.gmBlackBoxY / scaled_font->em_square;
|
extents->height = (double)metrics.gmBlackBoxY / scaled_font->em_square;
|
||||||
extents->x_advance = (double)metrics.gmCellIncX / scaled_font->em_square;
|
extents->x_advance = (double)metrics.gmCellIncX / scaled_font->em_square;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче