summaryrefslogtreecommitdiff
path: root/noncore/unsupported/qpdf/xpdf/Catalog.cc
authorsandman <sandman>2002-05-23 23:51:52 (UTC)
committer sandman <sandman>2002-05-23 23:51:52 (UTC)
commit2f3bb7b07f833273d966d41813e68bfe8b9d8d76 (patch) (unidiff)
tree00beb1bd9e7f4ba79e22334a0d258269b28f4564 /noncore/unsupported/qpdf/xpdf/Catalog.cc
parent6e82b45dd416ceeba78765717b700e853c96a137 (diff)
downloadopie-2f3bb7b07f833273d966d41813e68bfe8b9d8d76.zip
opie-2f3bb7b07f833273d966d41813e68bfe8b9d8d76.tar.gz
opie-2f3bb7b07f833273d966d41813e68bfe8b9d8d76.tar.bz2
Port to xpdf 1.01
Diffstat (limited to 'noncore/unsupported/qpdf/xpdf/Catalog.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/qpdf/xpdf/Catalog.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/unsupported/qpdf/xpdf/Catalog.cc b/noncore/unsupported/qpdf/xpdf/Catalog.cc
index 6a0c2d5..1212e2e 100644
--- a/noncore/unsupported/qpdf/xpdf/Catalog.cc
+++ b/noncore/unsupported/qpdf/xpdf/Catalog.cc
@@ -1,17 +1,17 @@
1//======================================================================== 1//========================================================================
2// 2//
3// Catalog.cc 3// Catalog.cc
4// 4//
5// Copyright 1996 Derek B. Noonburg 5// Copyright 1996-2002 Glyph & Cog, LLC
6// 6//
7//======================================================================== 7//========================================================================
8 8
9#ifdef __GNUC__ 9#ifdef __GNUC__
10#pragma implementation 10#pragma implementation
11#endif 11#endif
12 12
13#include <aconf.h> 13#include <aconf.h>
14#include <stddef.h> 14#include <stddef.h>
15#include "gmem.h" 15#include "gmem.h"
16#include "Object.h" 16#include "Object.h"
17#include "XRef.h" 17#include "XRef.h"
@@ -137,25 +137,25 @@ Catalog::~Catalog() {
137 137
138GString *Catalog::readMetadata() { 138GString *Catalog::readMetadata() {
139 GString *s; 139 GString *s;
140 Dict *dict; 140 Dict *dict;
141 Object obj; 141 Object obj;
142 int c; 142 int c;
143 143
144 if (!metadata.isStream()) { 144 if (!metadata.isStream()) {
145 return NULL; 145 return NULL;
146 } 146 }
147 dict = metadata.streamGetDict(); 147 dict = metadata.streamGetDict();
148 if (!dict->lookup("Subtype", &obj)->isName("XML")) { 148 if (!dict->lookup("Subtype", &obj)->isName("XML")) {
149 error(-1, "Unknown Metadata type: '%s'\n", 149 error(-1, "Unknown Metadata type: '%s'",
150 obj.isName() ? obj.getName() : "???"); 150 obj.isName() ? obj.getName() : "???");
151 } 151 }
152 obj.free(); 152 obj.free();
153 s = new GString(); 153 s = new GString();
154 metadata.streamReset(); 154 metadata.streamReset();
155 while ((c = metadata.streamGetChar()) != EOF) { 155 while ((c = metadata.streamGetChar()) != EOF) {
156 s->append(c); 156 s->append(c);
157 } 157 }
158 metadata.streamClose(); 158 metadata.streamClose();
159 return s; 159 return s;
160} 160}
161 161
@@ -256,28 +256,28 @@ LinkDest *Catalog::findDest(GString *name) {
256 if (!found && nameTree.isDict()) { 256 if (!found && nameTree.isDict()) {
257 if (!findDestInTree(&nameTree, name, &obj1)->isNull()) 257 if (!findDestInTree(&nameTree, name, &obj1)->isNull())
258 found = gTrue; 258 found = gTrue;
259 else 259 else
260 obj1.free(); 260 obj1.free();
261 } 261 }
262 if (!found) 262 if (!found)
263 return NULL; 263 return NULL;
264 264
265 // construct LinkDest 265 // construct LinkDest
266 dest = NULL; 266 dest = NULL;
267 if (obj1.isArray()) { 267 if (obj1.isArray()) {
268 dest = new LinkDest(obj1.getArray(), gTrue); 268 dest = new LinkDest(obj1.getArray());
269 } else if (obj1.isDict()) { 269 } else if (obj1.isDict()) {
270 if (obj1.dictLookup("D", &obj2)->isArray()) 270 if (obj1.dictLookup("D", &obj2)->isArray())
271 dest = new LinkDest(obj2.getArray(), gTrue); 271 dest = new LinkDest(obj2.getArray());
272 else 272 else
273 error(-1, "Bad named destination value"); 273 error(-1, "Bad named destination value");
274 obj2.free(); 274 obj2.free();
275 } else { 275 } else {
276 error(-1, "Bad named destination value"); 276 error(-1, "Bad named destination value");
277 } 277 }
278 obj1.free(); 278 obj1.free();
279 279
280 return dest; 280 return dest;
281} 281}
282 282
283Object *Catalog::findDestInTree(Object *tree, GString *name, Object *obj) { 283Object *Catalog::findDestInTree(Object *tree, GString *name, Object *obj) {