poppler/SplashOutputDev.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit fa5fddd6176725fdae02a500c6955dafe993941e Author: Albert Astals Cid <[email protected]> Date: Mon Feb 7 19:48:28 2011 +0000 Make sure tx is inside the bitmap Seems to be what the code tried to do, fixes crash in bug 33948 depending on the resolution you render it diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc index 0b60a87..aed3740 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -15,7 +15,7 @@ // // Copyright (C) 2005 Takashi Iwai <[email protected]> // Copyright (C) 2006 Stefan Schweizer <[email protected]> -// Copyright (C) 2006-2010 Albert Astals Cid <[email protected]> +// Copyright (C) 2006-2011 Albert Astals Cid <[email protected]> // Copyright (C) 2006 Krzysztof Kowalczyk <[email protected]> // Copyright (C) 2006 Scott Turner <[email protected]> // Copyright (C) 2007 Koji Otani <[email protected]> @@ -3011,14 +3011,14 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, tx = (int)floor(xMin); if (tx < 0) { tx = 0; - } else if (tx > bitmap->getWidth()) { - tx = bitmap->getWidth(); + } else if (tx >= bitmap->getWidth()) { + tx = bitmap->getWidth() - 1; } ty = (int)floor(yMin); if (ty < 0) { ty = 0; - } else if (ty > bitmap->getHeight()) { - ty = bitmap->getHeight(); + } else if (ty >= bitmap->getHeight()) { + ty = bitmap->getHeight() - 1; } w = (int)ceil(xMax) - tx + 1; if (tx + w > bitmap->getWidth()) { _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
