X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fxpdf%2FDict.cc;fp=pdf2swf%2Fxpdf%2FDict.cc;h=5eb077e0937cab2186de3417d37230bd5c010d12;hb=50dd339d3d6262763616efe8d7ee415ab19befb9;hp=94ca386ac044f8e876976ae0f491be06a8493260;hpb=33b4efceb35f7582426665aba920fd950edc0602;p=swftools.git diff --git a/pdf2swf/xpdf/Dict.cc b/pdf2swf/xpdf/Dict.cc index 94ca386..5eb077e 100644 --- a/pdf2swf/xpdf/Dict.cc +++ b/pdf2swf/xpdf/Dict.cc @@ -2,7 +2,7 @@ // // Dict.cc // -// Copyright 1996 Derek B. Noonburg +// Copyright 1996-2002 Glyph & Cog, LLC // //======================================================================== @@ -10,6 +10,7 @@ #pragma implementation #endif +#include #include #include #include "gmem.h" @@ -21,7 +22,8 @@ // Dict //------------------------------------------------------------------------ -Dict::Dict() { +Dict::Dict(XRef *xrefA) { + xref = xrefA; entries = NULL; size = length = 0; ref = 1; @@ -66,7 +68,7 @@ GBool Dict::is(char *type) { Object *Dict::lookup(char *key, Object *obj) { DictEntry *e; - return (e = find(key)) ? e->val.fetch(obj) : obj->initNull(); + return (e = find(key)) ? e->val.fetch(xref, obj) : obj->initNull(); } Object *Dict::lookupNF(char *key, Object *obj) { @@ -80,26 +82,9 @@ char *Dict::getKey(int i) { } Object *Dict::getVal(int i, Object *obj) { - return entries[i].val.fetch(obj); + return entries[i].val.fetch(xref, obj); } Object *Dict::getValNF(int i, Object *obj) { return entries[i].val.copy(obj); } - -void Dict::dumpEntries() -{ - int t; - for(t=0;t