summaryrefslogtreecommitdiff
path: root/print/poppler/patches
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2008-06-05 21:03:37 +0000
committerdrochner <drochner@pkgsrc.org>2008-06-05 21:03:37 +0000
commita8bd1f3b4d7178b691c9fe2faec97b48432624f7 (patch)
tree7ee40bc7d59a82072b2d530ecfa65af62bbc06a1 /print/poppler/patches
parentdc3dd65b68dfdea573dc5e33e7fa368bd1845c44 (diff)
downloadpkgsrc-a8bd1f3b4d7178b691c9fe2faec97b48432624f7.tar.gz
update to 0.8.3
changes: -fix crashes on certain input -Fix leaks -Do not limit CharCodeToUnicodeString to 8 characters -Support for surrogates outside the BMP plane pkgsrc note: the crashes had been fixed by patches in pkgsrc before
Diffstat (limited to 'print/poppler/patches')
-rw-r--r--print/poppler/patches/patch-ah22
-rw-r--r--print/poppler/patches/patch-ai89
2 files changed, 0 insertions, 111 deletions
diff --git a/print/poppler/patches/patch-ah b/print/poppler/patches/patch-ah
deleted file mode 100644
index 9ae5dd95f08..00000000000
--- a/print/poppler/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2008/05/15 09:15:41 drochner Exp $
-
---- poppler/Annot.cc.orig 2008-03-26 20:38:52.000000000 +0100
-+++ poppler/Annot.cc
-@@ -1735,7 +1735,7 @@ void AnnotWidget::initialize(XRef *xrefA
- // Only text or choice fields needs to have appearance regenerated
- // see section 8.6.2 "Variable Text" of PDFReference
- regen = gFalse;
-- if (widget->getType () == formText || widget->getType () == formChoice) {
-+ if (widget != NULL && (widget->getType () == formText || widget->getType () == formChoice)) {
- regen = form->getNeedAppearances ();
- }
-
-@@ -2577,7 +2577,7 @@ void AnnotWidget::generateFieldAppearanc
- int dashLength, ff, quadding, comb, nOptions, topIdx, i, j;
- GBool modified;
-
-- if (!widget->getField () || !widget->getField ()->getObj ()->isDict ())
-+ if (widget == NULL || !widget->getField () || !widget->getField ()->getObj ()->isDict ())
- return;
-
- field = widget->getField ()->getObj ()->getDict ();
diff --git a/print/poppler/patches/patch-ai b/print/poppler/patches/patch-ai
deleted file mode 100644
index a76d829ef64..00000000000
--- a/print/poppler/patches/patch-ai
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2008/05/15 17:51:29 drochner Exp $
-
---- poppler/OptionalContent.cc.orig 2008-03-26 20:38:52.000000000 +0100
-+++ poppler/OptionalContent.cc
-@@ -162,12 +162,18 @@ OptionalContentGroup* OCGs::findOcgByRef
- {
- //TODO: make this more efficient
- OptionalContentGroup *ocg = NULL;
-- for (int i=0; i < optionalContentGroups->getLength(); ++i) {
-- ocg = (OptionalContentGroup*)optionalContentGroups->get(i);
-- if ( (ocg->ref().num == ref.num) && (ocg->ref().gen == ref.gen) ) {
-- return ocg;
-+ if (optionalContentGroups != NULL)
-+ {
-+ for (int i=0; i < optionalContentGroups->getLength(); ++i) {
-+ ocg = (OptionalContentGroup*)optionalContentGroups->get(i);
-+ if ( (ocg->ref().num == ref.num) && (ocg->ref().gen == ref.gen) ) {
-+ return ocg;
-+ }
- }
- }
-+
-+ error(-1, "Could not find a OCG with Ref (%d:%d)", ref.num, ref.gen);
-+
- // not found
- return NULL;
- }
-@@ -208,7 +214,7 @@ bool OCGs::optContentIsVisible( Object *
- }
- } else if (ocg.isRef()) {
- OptionalContentGroup* oc = findOcgByRef( ocg.getRef() );
-- if ( oc->state() == OptionalContentGroup::Off ) {
-+ if ( !oc || oc->state() == OptionalContentGroup::Off ) {
- result = false;
- } else {
- result = true ;
-@@ -218,13 +224,10 @@ bool OCGs::optContentIsVisible( Object *
- policy.free();
- } else if ( dictType.isName("OCG") ) {
- OptionalContentGroup* oc = findOcgByRef( dictRef->getRef() );
-- if ( oc ) {
--// printf("Found valid group object\n");
-- if ( oc->state() == OptionalContentGroup::Off ) {
-- result=false;
-- }
-+ if ( !oc || oc->state() == OptionalContentGroup::Off ) {
-+ result=false;
- }
-- }
-+ }
- dictType.free();
- dictObj.free();
- // printf("visibility: %s\n", result? "on" : "off");
-@@ -238,7 +241,7 @@ bool OCGs::allOn( Array *ocgArray )
- ocgArray->getNF(i, &ocgItem);
- if (ocgItem.isRef()) {
- OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() );
-- if ( oc->state() == OptionalContentGroup::Off ) {
-+ if ( oc && oc->state() == OptionalContentGroup::Off ) {
- return false;
- }
- }
-@@ -253,7 +256,7 @@ bool OCGs::allOff( Array *ocgArray )
- ocgArray->getNF(i, &ocgItem);
- if (ocgItem.isRef()) {
- OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() );
-- if ( oc->state() == OptionalContentGroup::On ) {
-+ if ( oc && oc->state() == OptionalContentGroup::On ) {
- return false;
- }
- }
-@@ -268,7 +271,7 @@ bool OCGs::anyOn( Array *ocgArray )
- ocgArray->getNF(i, &ocgItem);
- if (ocgItem.isRef()) {
- OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() );
-- if ( oc->state() == OptionalContentGroup::On ) {
-+ if ( oc && oc->state() == OptionalContentGroup::On ) {
- return true;
- }
- }
-@@ -283,7 +286,7 @@ bool OCGs::anyOff( Array *ocgArray )
- ocgArray->getNF(i, &ocgItem);
- if (ocgItem.isRef()) {
- OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() );
-- if ( oc->state() == OptionalContentGroup::Off ) {
-+ if ( oc && oc->state() == OptionalContentGroup::Off ) {
- return true;
- }
- }