From 519259df4e539f7fefa23b31922806046b4d2a31 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 13 Apr 2010 11:32:39 +0000 Subject: revert 17734 changes git-svn-id: svn://tug.org/texlive/trunk@17837 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog | 6 +- .../xpdf/xpdf-3.02-PATCHES/patch-45-getmetadatanf | 105 --------------------- Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.cc | 10 -- Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.h | 15 --- 4 files changed, 5 insertions(+), 131 deletions(-) delete mode 100644 Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-45-getmetadatanf (limited to 'Build/source/libs') diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog index 5a0fad74551..e3159e126dc 100644 --- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog +++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog @@ -1,6 +1,10 @@ +2010-04-13 Peter Breitenlohner + + * patch-45-getmetadatanf (removed): unnecessary. + 2010-04-06 Hartmut Henkel - * patch-45-getmetadatanf(new): needed by luaTeX's pdftoepdf.cc. + * patch-45-getmetadatanf (new): needed by luaTeX's pdftoepdf.cc. 2009-09-15 Peter Breitenlohner diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-45-getmetadatanf b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-45-getmetadatanf deleted file mode 100644 index 620984a718d..00000000000 --- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-45-getmetadatanf +++ /dev/null @@ -1,105 +0,0 @@ -diff -ur -N xpdf-3.02.orig/xpdf/Page.cc xpdf-3.02/xpdf/Page.cc ---- xpdf-3.02.orig/xpdf/Page.cc 2009-05-07 00:22:58.000000000 +0200 -+++ xpdf-3.02/xpdf/Page.cc 2010-04-06 23:04:12.000000000 +0200 -@@ -5,6 +5,9 @@ - // Copyright 1996-2007 Glyph & Cog, LLC - // - //======================================================================== -+// -+// Copyright 2009 Hartmut Henkel -+// for added metadataNF and resourcesNF needed by luatex - - #include - -@@ -126,6 +129,10 @@ - dict->lookup("BoxColorInfo", &boxColorInfo); - dict->lookup("Group", &group); - dict->lookup("Metadata", &metadata); -+ -+ // much better would be to get direct access to the page dictionary, but how? -+ dict->lookupNF("Metadata", &metadataNF); -+ - dict->lookup("PieceInfo", &pieceInfo); - dict->lookup("SeparationInfo", &separationInfo); - -@@ -136,6 +143,7 @@ - obj1.copy(&resources); - } - obj1.free(); -+ dict->lookupNF("Resources", &resourcesNF); - } - - PageAttrs::~PageAttrs() { -@@ -143,9 +151,11 @@ - boxColorInfo.free(); - group.free(); - metadata.free(); -+ metadataNF.free(); - pieceInfo.free(); - separationInfo.free(); - resources.free(); -+ resourcesNF.free(); - } - - GBool PageAttrs::readBox(Dict *dict, char *key, PDFRectangle *box) { -diff -ur -N xpdf-3.02.orig/xpdf/Page.h xpdf-3.02/xpdf/Page.h ---- xpdf-3.02.orig/xpdf/Page.h 2007-02-27 23:05:52.000000000 +0100 -+++ xpdf-3.02/xpdf/Page.h 2010-04-06 23:04:12.000000000 +0200 -@@ -5,6 +5,10 @@ - // Copyright 1996-2003 Glyph & Cog, LLC - // - //======================================================================== -+// -+// Copyright 2009 Hartmut Henkel -+// for added metadataNF, resourcesNF, getMetadataNF, and getResourcesNF -+// needed by luatex - - #ifndef PAGE_H - #define PAGE_H -@@ -68,6 +72,10 @@ - { return group.isDict() ? group.getDict() : (Dict *)NULL; } - Stream *getMetadata() - { return metadata.isStream() ? metadata.getStream() : (Stream *)NULL; } -+ -+ // much better would be to get direct access to the page dictionary, but how? -+ Object * getMetadataNF() { return &metadataNF; } -+ - Dict *getPieceInfo() - { return pieceInfo.isDict() ? pieceInfo.getDict() : (Dict *)NULL; } - Dict *getSeparationInfo() -@@ -76,6 +84,9 @@ - Dict *getResourceDict() - { return resources.isDict() ? resources.getDict() : (Dict *)NULL; } - -+ // much better would be to get direct access to the page dictionary, but how? -+ Object *getResourcesNF() { return &resourcesNF; } -+ - private: - - GBool readBox(Dict *dict, char *key, PDFRectangle *box); -@@ -91,9 +102,11 @@ - Object boxColorInfo; - Object group; - Object metadata; -+ Object metadataNF; - Object pieceInfo; - Object separationInfo; - Object resources; -+ Object resourcesNF; - }; - - //------------------------------------------------------------------------ -@@ -133,11 +146,13 @@ - Dict *getBoxColorInfo() { return attrs->getBoxColorInfo(); } - Dict *getGroup() { return attrs->getGroup(); } - Stream *getMetadata() { return attrs->getMetadata(); } -+ Object *getMetadataNF() { return attrs->getMetadataNF(); } - Dict *getPieceInfo() { return attrs->getPieceInfo(); } - Dict *getSeparationInfo() { return attrs->getSeparationInfo(); } - - // Get resource dictionary. - Dict *getResourceDict() { return attrs->getResourceDict(); } -+ Object *getResourcesNF() { return attrs->getResourcesNF(); } - - // Get annotations array. - Object *getAnnots(Object *obj) { return annots.fetch(xref, obj); } diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.cc b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.cc index ebf13b9e8bb..6b52ba936ff 100644 --- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.cc +++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.cc @@ -5,9 +5,6 @@ // Copyright 1996-2007 Glyph & Cog, LLC // //======================================================================== -// -// Copyright 2009 Hartmut Henkel -// for added metadataNF and resourcesNF needed by luatex #include @@ -129,10 +126,6 @@ PageAttrs::PageAttrs(PageAttrs *attrs, Dict *dict) { dict->lookup("BoxColorInfo", &boxColorInfo); dict->lookup("Group", &group); dict->lookup("Metadata", &metadata); - - // much better would be to get direct access to the page dictionary, but how? - dict->lookupNF("Metadata", &metadataNF); - dict->lookup("PieceInfo", &pieceInfo); dict->lookup("SeparationInfo", &separationInfo); @@ -143,7 +136,6 @@ PageAttrs::PageAttrs(PageAttrs *attrs, Dict *dict) { obj1.copy(&resources); } obj1.free(); - dict->lookupNF("Resources", &resourcesNF); } PageAttrs::~PageAttrs() { @@ -151,11 +143,9 @@ PageAttrs::~PageAttrs() { boxColorInfo.free(); group.free(); metadata.free(); - metadataNF.free(); pieceInfo.free(); separationInfo.free(); resources.free(); - resourcesNF.free(); } GBool PageAttrs::readBox(Dict *dict, char *key, PDFRectangle *box) { diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.h index 3526c65e3bc..2b011756e85 100644 --- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.h +++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.h @@ -5,10 +5,6 @@ // Copyright 1996-2003 Glyph & Cog, LLC // //======================================================================== -// -// Copyright 2009 Hartmut Henkel -// for added metadataNF, resourcesNF, getMetadataNF, and getResourcesNF -// needed by luatex #ifndef PAGE_H #define PAGE_H @@ -72,10 +68,6 @@ public: { return group.isDict() ? group.getDict() : (Dict *)NULL; } Stream *getMetadata() { return metadata.isStream() ? metadata.getStream() : (Stream *)NULL; } - - // much better would be to get direct access to the page dictionary, but how? - Object * getMetadataNF() { return &metadataNF; } - Dict *getPieceInfo() { return pieceInfo.isDict() ? pieceInfo.getDict() : (Dict *)NULL; } Dict *getSeparationInfo() @@ -84,9 +76,6 @@ public: Dict *getResourceDict() { return resources.isDict() ? resources.getDict() : (Dict *)NULL; } - // much better would be to get direct access to the page dictionary, but how? - Object *getResourcesNF() { return &resourcesNF; } - private: GBool readBox(Dict *dict, char *key, PDFRectangle *box); @@ -102,11 +91,9 @@ private: Object boxColorInfo; Object group; Object metadata; - Object metadataNF; Object pieceInfo; Object separationInfo; Object resources; - Object resourcesNF; }; //------------------------------------------------------------------------ @@ -146,13 +133,11 @@ public: Dict *getBoxColorInfo() { return attrs->getBoxColorInfo(); } Dict *getGroup() { return attrs->getGroup(); } Stream *getMetadata() { return attrs->getMetadata(); } - Object *getMetadataNF() { return attrs->getMetadataNF(); } Dict *getPieceInfo() { return attrs->getPieceInfo(); } Dict *getSeparationInfo() { return attrs->getSeparationInfo(); } // Get resource dictionary. Dict *getResourceDict() { return attrs->getResourceDict(); } - Object *getResourcesNF() { return attrs->getResourcesNF(); } // Get annotations array. Object *getAnnots(Object *obj) { return annots.fetch(xref, obj); } -- cgit v1.2.3