poppler/SplashOutputDev.cc | 7 +++++++ 1 file changed, 7 insertions(+)
New commits: commit a98f99e90aac703e648697da5c897c49645eda10 Author: Kenji Uno <[email protected]> Date: Wed Sep 16 22:08:59 2015 +0200 SplashOuputDev: Protect calls to set/getAA with the proper #if guards Bug #92006 diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc index d9d5699..7759382 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -35,6 +35,7 @@ // Copyright (C) 2014 Ed Porras <[email protected]> // Copyright (C) 2014 Richard PALO <[email protected]> // Copyright (C) 2015 Tamas Szekeres <[email protected]> +// Copyright (C) 2015 Kenji Uno <[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 @@ -4058,7 +4059,9 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, // save state transpGroup->origBitmap = bitmap; transpGroup->origSplash = splash; +#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H transpGroup->fontAA = fontEngine->getAA(); +#endif //~ this handles the blendingColorSpace arg for soft masks, but //~ not yet for transparency groups @@ -4091,7 +4094,9 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, splash = new Splash(bitmap, vectorAntialias, transpGroup->origSplash->getScreen()); if (transpGroup->next != NULL && transpGroup->next->knockout) { +#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H fontEngine->setAA(gFalse); +#endif } splash->setThinLineMode(transpGroup->origSplash->getThinLineMode()); splash->setMinLineWidth(globalParams->getMinLineWidth()); @@ -4155,7 +4160,9 @@ void SplashOutputDev::paintTransparencyGroup(GfxState *state, double *bbox) { splash->composite(tBitmap, 0, 0, tx, ty, tBitmap->getWidth(), tBitmap->getHeight(), gFalse, !isolated, transpGroupStack->next != NULL && transpGroupStack->next->knockout, knockoutOpacity); +#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H fontEngine->setAA(transpGroupStack->fontAA); +#endif if (transpGroupStack->next != NULL && transpGroupStack->next->shape != NULL) { transpGroupStack->next->knockout = gTrue; } _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
