fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-09 06:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ATSUI] Use screen metrics instead of ideal metrics to compute glyph extents

Browse source 
The glyph extent computation was totally busted.  It was using "logical"
extents and it was not correctly handling rotations, etc.  It all looks a lot
better now.
This commit is contained in:
Brian Ewins 2006-12-17 22:26:02 -05:00 • committed by Behdad Esfahbod
parent c6ec6ed696
commit f3b9f486cd
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/cairo-atsui-font.c
View file

@ -363,28 +363,30 @@ _cairo_atsui_font_init_glyph_metrics (cairo_atsui_font_t *font,
cairo_text_extents_t extents;
OSStatus err;
GlyphID theGlyph = _cairo_scaled_glyph_index (scaled_glyph);
ATSGlyphIdealMetrics metricsH, metricsV;
ATSUStyle style;
ATSGlyphScreenMetrics metricsH, metricsV;
ATSUStyle style,style1;
ATSUVerticalCharacterType verticalType = kATSUStronglyVertical;
const ATSUAttributeTag theTag[] = { kATSUVerticalCharacterTag };
const ByteCount theSizes[] = { sizeof(verticalType) };
ATSUAttributeValuePtr theValues[] = { &verticalType };
double xscale;
double yscale;
ATSUCreateAndCopyStyle(font->unscaled_style, &style);
_cairo_matrix_compute_scale_factors(&font->base.scale, &xscale, &yscale, 1);
err = ATSUGlyphGetIdealMetrics(style,
1, &theGlyph, 0, &metricsH);
ATSUCreateAndCopyStyle(font->style, &style);
err = ATSUGlyphGetScreenMetrics(style,
1, &theGlyph, 0, false, false, &metricsH);
err = ATSUSetAttributes(style, 1, theTag, theSizes, theValues);
err = ATSUGlyphGetIdealMetrics(style,
1, &theGlyph, 0, &metricsV);
err = ATSUGlyphGetScreenMetrics(style,
1, &theGlyph, 0, false, false, &metricsV);
extents.x_bearing = metricsH.sideBearing.x;
extents.y_bearing = metricsV.advance.y;
extents.width =
metricsH.advance.x - metricsH.sideBearing.x - metricsH.otherSideBearing.x;
extents.height =
-metricsV.advance.y - metricsV.sideBearing.y - metricsV.otherSideBearing.y;
extents.x_advance = metricsH.advance.x;
extents.width = metricsH.width/xscale;
extents.height = metricsH.height/yscale;
extents.x_bearing = metricsH.sideBearing.x/xscale;
extents.y_bearing = metricsV.sideBearing.y/yscale - extents.height;
extents.x_advance = metricsH.deviceAdvance.x/xscale;
extents.y_advance = 0;
_cairo_scaled_glyph_set_metrics (scaled_glyph,