Kaydet (Commit) 7963d2b0 authored tarafından Vort's avatar Vort Kaydeden (comit) Caolán McNamara

fdo#40513 PDF Import: Hack: Replace incorrect values of font's ascent property

Change-Id: Ib7bd6e15fff5213b5d935c6f03f2c65ea3f6ca50
Reviewed-on: https://gerrit.libreoffice.org/8416Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 0feaf455
......@@ -792,12 +792,29 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
if( u == NULL )
return;
GfxFont* font = state->getFont();
double ascent = font->getAscent();
GooString* fontName = font->getName();
// Hackfix until incorrect ascent values are fixed in poppler (fdo#75667)
if ((fontName->cmpN("Arial", 5) == 0) &&
(ascent > 0.717) && (ascent < 0.719))
{
ascent = 0.905;
}
else if ((fontName->cmpN("Times New Roman", 15) == 0) &&
(ascent > 0.682) && (ascent < 0.684))
{
ascent = 0.891;
}
// normalize coordinates: correct from baseline-relative to upper
// left corner of glyphs
double x2(0.0), y2(0.0);
state->textTransformDelta( 0.0,
state->getFont()->getAscent(),
ascent,
&x2, &y2 );
const double fFontSize(state->getFontSize());
x += x2*fFontSize;
y += y2*fFontSize;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment