poppler/GfxState.cc | 3 ++- poppler/GfxState.h | 3 ++- poppler/SplashOutputDev.cc | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit 098d98dfc3846150098f5b20f3f5a07cb565c465 Author: Lu Wang <[email protected]> Date: Sat Jan 26 19:31:20 2013 +0100 Rename function Makes it say more what it does diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc index 73a3781..3e5e053 100644 --- a/poppler/GfxState.cc +++ b/poppler/GfxState.cc @@ -24,6 +24,7 @@ // Copyright (C) 2010 Christian Feuersänger <[email protected]> // Copyright (C) 2011 Andrea Canciani <[email protected]> // Copyright (C) 2012 William Bader <[email protected]> +// Copyright (C) 2013 Lu Wang <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -6160,7 +6161,7 @@ void GfxState::concatCTM(double a, double b, double c, ctm[5] = e * b1 + f * d1 + ctm[5]; } -void GfxState::shiftCTM(double tx, double ty) { +void GfxState::shiftCTMAndClip(double tx, double ty) { ctm[4] += tx; ctm[5] += ty; clipXMin += tx; diff --git a/poppler/GfxState.h b/poppler/GfxState.h index f2ce6b2..aa15a75 100644 --- a/poppler/GfxState.h +++ b/poppler/GfxState.h @@ -21,6 +21,7 @@ // Copyright (C) 2010 Christian Feuersänger <[email protected]> // Copyright (C) 2011 Andrea Canciani <[email protected]> // Copyright (C) 2011, 2012 Thomas Freitag <[email protected]> +// Copyright (C) 2013 Lu Wang <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -1443,7 +1444,7 @@ public: double d, double e, double f); void concatCTM(double a, double b, double c, double d, double e, double f); - void shiftCTM(double tx, double ty); + void shiftCTMAndClip(double tx, double ty); void setFillColorSpace(GfxColorSpace *colorSpace); void setStrokeColorSpace(GfxColorSpace *colorSpace); void setFillColor(GfxColor *color) { fillColor = *color; } diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc index 94ee8d6..84023a6 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -30,6 +30,7 @@ // Copyright (C) 2011 Andreas Hartmetz <[email protected]> // Copyright (C) 2011 Andrea Canciani <[email protected]> // Copyright (C) 2011, 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2013 Lu Wang <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -3839,7 +3840,7 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, splash->setInNonIsolatedGroup(shape, tx, ty); } transpGroup->tBitmap = bitmap; - state->shiftCTM(-tx, -ty); + state->shiftCTMAndClip(-tx, -ty); updateCTM(state, 0, 0, 0, 0, 0, 0); ++nestCount; } @@ -3851,7 +3852,7 @@ void SplashOutputDev::endTransparencyGroup(GfxState *state) { bitmap = transpGroupStack->origBitmap; colorMode = bitmap->getMode(); splash = transpGroupStack->origSplash; - state->shiftCTM(transpGroupStack->tx, transpGroupStack->ty); + state->shiftCTMAndClip(transpGroupStack->tx, transpGroupStack->ty); updateCTM(state, 0, 0, 0, 0, 0, 0); }
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
