From df54862ec61c81a39b7ccfadc292b5bf859f45fa Mon Sep 17 00:00:00 2001 From: Vort Date: Wed, 21 Jan 2015 08:39:08 +0200 Subject: fdo#85174 PDF Import: fix character positions without modifying poppler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4ec6409e8fa13161c5cd37fcae2055b4bc5ecfd4 Reviewed-on: https://gerrit.libreoffice.org/14066 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- external/poppler/UnpackedTarball_poppler.mk | 1 - external/poppler/poppler-new-drawchar.patch.1 | 59 --------------------------- 2 files changed, 60 deletions(-) delete mode 100644 external/poppler/poppler-new-drawchar.patch.1 (limited to 'external') diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index e2a6d4c77210..3f9c9f857357 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/poppler-nochecknew.patch.1 \ external/poppler/poppler-vs2013.patch.1 \ external/poppler/poppler-0.26.4-std-max.patch.1 \ - external/poppler/poppler-new-drawchar.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/poppler/poppler-new-drawchar.patch.1 b/external/poppler/poppler-new-drawchar.patch.1 deleted file mode 100644 index bc692f506977..000000000000 --- a/external/poppler/poppler-new-drawchar.patch.1 +++ /dev/null @@ -1,59 +0,0 @@ -diff -u a/poppler/Gfx.cc b/poppler/Gfx.cc ---- a/poppler/Gfx.cc 2015-01-20 07:54:51.255889300 +0200 -+++ b/poppler/Gfx.cc 2015-01-20 08:19:38.734968200 +0200 -@@ -4031,27 +4031,41 @@ - n = font->getNextChar(p, len, &code, - &u, &uLen, - &dx, &dy, &originX, &originY); -+ dx2 = dx; -+ dy2 = dy; - if (wMode) { - dx *= state->getFontSize(); -+ dx2 *= state->getFontSize(); - dy = dy * state->getFontSize() + state->getCharSpace(); -+ dy2 = dy2 * state->getFontSize(); - if (n == 1 && *p == ' ') { - dy += state->getWordSpace(); -+ dy2 += state->getWordSpace(); - } - } else { - dx = dx * state->getFontSize() + state->getCharSpace(); -+ dx2 = dx2 * state->getFontSize(); - if (n == 1 && *p == ' ') { - dx += state->getWordSpace(); -+ dx2 += state->getWordSpace(); - } - dx *= state->getHorizScaling(); -+ dx2 *= state->getHorizScaling(); - dy *= state->getFontSize(); -+ dy2 *= state->getFontSize(); - } - state->textTransformDelta(dx, dy, &tdx, &tdy); -+ state->textTransformDelta(dx2, dy2, &ddx, &ddy); - originX *= state->getFontSize(); - originY *= state->getFontSize(); - state->textTransformDelta(originX, originY, &tOriginX, &tOriginY); - if (ocState) -+ { -+ out->drawChar2(state, state->getCurX() + riseX, state->getCurY() + riseY, -+ ddx, ddy, tOriginX, tOriginY, code, n, u, uLen); - out->drawChar(state, state->getCurX() + riseX, state->getCurY() + riseY, - tdx, tdy, tOriginX, tOriginY, code, n, u, uLen); -+ } - state->shift(tdx, tdy); - p += n; - len -= n; -diff -u a/poppler/OutputDev.h b/poppler/OutputDev.h ---- a/poppler/OutputDev.h 2014-04-26 18:37:22.000000000 +0300 -+++ b/poppler/OutputDev.h 2015-01-20 08:20:22.321461200 +0200 -@@ -244,6 +244,10 @@ - double /*dx*/, double /*dy*/, - double /*originX*/, double /*originY*/, - CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) {} -+ virtual void drawChar2(GfxState * /*state*/, double /*x*/, double /*y*/, -+ double /*dx*/, double /*dy*/, -+ double /*originX*/, double /*originY*/, -+ CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) {} - virtual void drawString(GfxState * /*state*/, GooString * /*s*/) {} - virtual GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, - double /*dx*/, double /*dy*/, -- cgit