canvas/source/cairo/cairo_textlayout.cxx | 25 ++-----------------------
1 file changed, 2 insertions(+), 23 deletions(-)
New commits:
commit 638f6cb6a666aa611d3e0bef5a29e5824b0574ee
Author: Jan Holesovsky <ke...@suse.cz>
Date: Fri Nov 9 11:38:11 2012 +0100
bnc#681110: Fix squashed glyphs with Cairo canvas.
I suppose it is the same misconception as in fdo#55931 - I am convinced that
the font metrics should not be used here.
Looks to me as if in the past, the font width computation was broken
somewhere
deep inside OOo, and everyone instead of fixing the root cause was just
working that around by using the FontMetric; and then one day the root cause
was fixed, and all the workarounds broke ;-) - but that is just a theory.
Change-Id: I741bf8f4eaea4f7d8bc698dc9a8124109dfb8c20
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index 6fa5562..317ea26 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -545,32 +545,13 @@ namespace cairocanvas
// Font rotation and scaling
cairo_matrix_t m;
Font aFont = rOutDev.GetFont();
- FontMetric aMetric( rOutDev.GetFontMetric(aFont) );
- long nWidth = 0;
-
- // width calculation is deep magic and platform/font dependant.
- // width == 0 means no scaling, and usually width == height means
the same.
- // Other values mean horizontal scaling (narrow or stretching)
- // see issue #101566
-
- //proper scale calculation across platforms
- if (aFont.GetWidth() == 0)
- {
- nWidth = aFont.GetHeight();
- }
- else
- {
- // any scaling needs to be relative to the platform-dependent
definition
- // of height of the font
- nWidth = aFont.GetWidth() * aFont.GetHeight() /
aMetric.GetHeight();
- }
cairo_matrix_init_identity(&m);
if (aSysLayoutData.orientation)
cairo_matrix_rotate(&m, (3600 - aSysLayoutData.orientation) *
M_PI / 1800.0);
- cairo_matrix_scale(&m, nWidth, aFont.GetHeight());
+ cairo_matrix_scale(&m, aFont.GetWidth(), aFont.GetHeight());
//faux italics
if (rSysFontData.bFakeItalic)
@@ -583,11 +564,9 @@ namespace cairocanvas
#else
# define TEMP_TRACE_FONT ::rtl::OUStringToOString( aFont.GetName(),
RTL_TEXTENCODING_UTF8 ).getStr()
#endif
- OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r):
Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s",
+ OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r):
Size:(%d,%d), Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s",
aFont.GetWidth(),
aFont.GetHeight(),
- aMetric.GetWidth(),
- nWidth,
(int) rOutpos.X(),
(int) rOutpos.Y(),
cairo_glyphs.size() > 0 ? cairo_glyphs[0].index : -1,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
