diff options
author | drochner <drochner> | 2008-08-26 17:10:02 +0000 |
---|---|---|
committer | drochner <drochner> | 2008-08-26 17:10:02 +0000 |
commit | 472d5ab8dadab23b44809404867810b159f8a7a0 (patch) | |
tree | 68a35676c736b6fa6dc3e00f0be66e1aae617f77 /print | |
parent | 719b2170e2016f541e032536f4a342cbab7f7ba4 (diff) | |
download | pkgsrc-472d5ab8dadab23b44809404867810b159f8a7a0.tar.gz |
update to 0.8.6
Changes since 0.8.5:
Core:
* Call error() when font loading fails
* Be less strict parsing TTF tables (bug #16940)
* Fix crash due to uninitialized variable
Qt 4 frontend:
* Make the paper color setting working as it should
* Make sure to use the correct page width/height for form widgets coordinates
Diffstat (limited to 'print')
-rw-r--r-- | print/poppler/Makefile.common | 4 | ||||
-rw-r--r-- | print/poppler/distinfo | 9 | ||||
-rw-r--r-- | print/poppler/patches/patch-aj | 44 |
3 files changed, 51 insertions, 6 deletions
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index 52078f5f34c..ebfff36efc4 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.18 2008/08/06 18:44:25 drochner Exp $ +# $NetBSD: Makefile.common,v 1.19 2008/08/26 17:10:02 drochner Exp $ # used by print/poppler/Makefile # used by print/poppler-qt4/Makefile -POPPLER_VERS= 0.8.5 +POPPLER_VERS= 0.8.6 DISTNAME= poppler-${POPPLER_VERS} CATEGORIES= print MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 56f2d20c14e..d1526e9c6bd 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.32 2008/08/06 18:44:25 drochner Exp $ +$NetBSD: distinfo,v 1.33 2008/08/26 17:10:02 drochner Exp $ -SHA1 (poppler-0.8.5.tar.gz) = 993c7ac0e12c20674908a44542f49b43bd417574 -RMD160 (poppler-0.8.5.tar.gz) = 26634a62d77471ed668507bd0c287bfff291f881 -Size (poppler-0.8.5.tar.gz) = 1466503 bytes +SHA1 (poppler-0.8.6.tar.gz) = 649714e66751effa1585882e23c24bc35f4945bd +RMD160 (poppler-0.8.6.tar.gz) = 61abe25f8c5f8496209ae767f12ad5aec6c2a6b1 +Size (poppler-0.8.6.tar.gz) = 1469172 bytes SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615 SHA1 (patch-ab) = e3d413ec50a098af06cb2efc2fac2042064498dd SHA1 (patch-ag) = 258b8bff3d167914539e40c3263d36ce55e2ea01 SHA1 (patch-ai) = d3d4411092b5c6dd61d3f197c01c3bcdad88cc0e +SHA1 (patch-aj) = f77f225d209a7a692e3ba4b7dae0c050f739bf5a diff --git a/print/poppler/patches/patch-aj b/print/poppler/patches/patch-aj new file mode 100644 index 00000000000..5c63f03f750 --- /dev/null +++ b/print/poppler/patches/patch-aj @@ -0,0 +1,44 @@ +$NetBSD: patch-aj,v 1.5 2008/08/26 17:10:02 drochner Exp $ + +--- poppler/CairoOutputDev.cc.orig 2008-06-28 17:11:01.000000000 +0200 ++++ poppler/CairoOutputDev.cc +@@ -122,6 +122,8 @@ CairoOutputDev::~CairoOutputDev() { + cairo_pattern_destroy (fill_pattern); + if (group) + cairo_pattern_destroy (group); ++ if (mask) ++ cairo_pattern_destroy (mask); + if (shape) + cairo_pattern_destroy (shape); + } +@@ -818,6 +820,8 @@ static uint32_t luminocity(uint32_t x) + /* XXX: do we need to deal with shape here? */ + void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha, + Function * transferFunc, GfxColor * backdropColor) { ++ cairo_pattern_destroy(mask); ++ + if (alpha == false) { + /* We need to mask according to the luminocity of the group. + * So we paint the group to an image surface convert it to a luminocity map +@@ -855,6 +859,9 @@ void CairoOutputDev::setSoftMask(GfxStat + cairo_set_source(maskCtx, group); + cairo_paint(maskCtx); + ++ /* XXX status = cairo_status(maskCtx); */ ++ cairo_destroy(maskCtx); ++ + /* convert to a luminocity map */ + uint32_t *source_data = (uint32_t*)cairo_image_surface_get_data(source); + /* get stride in units of 32 bits */ +@@ -884,10 +891,8 @@ void CairoOutputDev::setSoftMask(GfxStat + cairo_pattern_set_matrix(mask, &patMatrix); + + cairo_surface_destroy(source); +- cairo_surface_destroy(pats); + } else { +- cairo_pattern_reference(group); +- mask = group; ++ mask = cairo_pattern_reference(group); + } + + popTransparencyGroup(); |