1 files changed, 15 insertions, 10 deletions

diff --git a/noncore/unsupported/qpdf/xpdf/XRef.h b/noncore/unsupported/qpdf/xpdf/XRef.h
index a44c495..7876fa6 100644
--- a/noncore/unsupported/qpdf/xpdf/XRef.h
+++ b/noncore/unsupported/qpdf/xpdf/XRef.h
@@ -2,7 +2,7 @@
 //
 // XRef.h
 //
-// Copyright 1996 Derek B. Noonburg
+// Copyright 1996-2002 Glyph & Cog, LLC
 //
 //========================================================================
 
@@ -24,7 +24,7 @@ class Stream;
 //------------------------------------------------------------------------
 
 struct XRefEntry {
-  int offset;
+  Guint offset;
   int gen;
   GBool used;
 };
@@ -41,6 +41,9 @@ public:
   // Is xref table valid?
   GBool isOk() { return ok; }
 
+  // Get the error code (if isOk() returns false).
+  int getErrorCode() { return errCode; }
+
   // Is the file encrypted?
 #ifndef NO_DECRYPTION
   GBool isEncrypted() { return encrypted; }
@@ -68,28 +71,29 @@ public:
   int getNumObjects() { return size; }
 
   // Return the offset of the last xref table.
-  int getLastXRefPos() { return lastXRefPos; }
+  Guint getLastXRefPos() { return lastXRefPos; }
 
   // Return the catalog object reference.
   int getRootNum() { return rootNum; }
   int getRootGen() { return rootGen; }
 
   // Get end position for a stream in a damaged file.
-  // Returns -1 if unknown or file is not damaged.
-  int getStreamEnd(int streamStart);
+  // Returns false if unknown or file is not damaged.
+  GBool getStreamEnd(Guint streamStart, Guint *streamEnd);
 
 private:
 
           BaseStream *str;      // input stream
-          int start;            // offset in file (to allow for garbage
+          Guint start;          // offset in file (to allow for garbage
                                 //   at beginning of file)
           XRefEntry *entries;   // xref entries
           int size;             // size of <entries> array
           int rootNum, rootGen;         // catalog dict
           GBool ok;             // true if xref table is valid
+          int errCode;          // error code (if <ok> is false)
           Object trailerDict;   // trailer dictionary
-          int lastXRefPos;      // offset of last xref table
-          int *streamEnds;      // 'endstream' positions - only used in
+          Guint lastXRefPos;    // offset of last xref table
+          Guint *streamEnds;    // 'endstream' positions - only used in
                                 //   damaged files
           int streamEndsLen;    // number of valid entries in streamEnds
 #ifndef NO_DECRYPTION
@@ -102,10 +106,11 @@ private:
           GBool ownerPasswordOk;// true if owner password is correct
 #endif
 
-  int readTrailer();
-  GBool readXRef(int *pos);
+  Guint readTrailer();
+  GBool readXRef(Guint *pos);
   GBool constructXRef();
   GBool checkEncrypted(GString *ownerPassword, GString *userPassword);
+  Guint strToUnsigned(char *s);
 };
 
 #endif