1 files changed, 12 insertions, 4 deletions

diff --git a/noncore/unsupported/qpdf/xpdf/PDFDoc.cc b/noncore/unsupported/qpdf/xpdf/PDFDoc.cc
index 4bbe9b7..97dfa55 100644
--- a/noncore/unsupported/qpdf/xpdf/PDFDoc.cc
+++ b/noncore/unsupported/qpdf/xpdf/PDFDoc.cc
@@ -1,11 +1,11 @@
 //========================================================================
 //
 // PDFDoc.cc
 //
-// Copyright 1996 Derek B. Noonburg
+// Copyright 1996-2002 Glyph & Cog, LLC
 //
 //========================================================================
 
 #ifdef __GNUC__
 #pragma implementation
 #endif
@@ -21,12 +21,13 @@
 #include "Catalog.h"
 #include "Stream.h"
 #include "XRef.h"
 #include "Link.h"
 #include "OutputDev.h"
 #include "Error.h"
+#include "ErrorCodes.h"
 #include "Lexer.h"
 #include "Parser.h"
 #include "PDFDoc.h"
 
 //------------------------------------------------------------------------
 
@@ -40,12 +41,13 @@
 PDFDoc::PDFDoc(GString *fileNameA, GString *ownerPassword,
                GString *userPassword, GBool printCommandsA) {
   Object obj;
   GString *fileName2;
 
   ok = gFalse;
+  errCode = errNone;
 
   file = NULL;
   str = NULL;
   xref = NULL;
   catalog = NULL;
   links = NULL;
@@ -54,40 +56,43 @@ PDFDoc::PDFDoc(GString *fileNameA, GString *ownerPassword,
   // try to open file
   fileName = fileNameA;
   fileName2 = NULL;
 #ifdef VMS
   if (!(file = fopen(fileName->getCString(), "rb", "ctx=stm"))) {
     error(-1, "Couldn't open file '%s'", fileName->getCString());
+    errCode = errOpenFile;
     return;
   }
 #else
   if (!(file = fopen(fileName->getCString(), "rb"))) {
     fileName2 = fileName->copy();
     fileName2->lowerCase();
     if (!(file = fopen(fileName2->getCString(), "rb"))) {
       fileName2->upperCase();
       if (!(file = fopen(fileName2->getCString(), "rb"))) {
         error(-1, "Couldn't open file '%s'", fileName->getCString());
         delete fileName2;
+        errCode = errOpenFile;
         return;
       }
     }
     delete fileName2;
   }
 #endif
 
   // create stream
   obj.initNull();
-  str = new FileStream(file, 0, -1, &obj);
+  str = new FileStream(file, 0, gFalse, 0, &obj);
 
   ok = setup(ownerPassword, userPassword);
 }
 
 PDFDoc::PDFDoc(BaseStream *strA, GString *ownerPassword,
                GString *userPassword, GBool printCommandsA) {
   ok = gFalse;
+  errCode = errNone;
   fileName = NULL;
   file = NULL;
   str = strA;
   xref = NULL;
   catalog = NULL;
   links = NULL;
@@ -100,19 +105,21 @@ GBool PDFDoc::setup(GString *ownerPassword, GString *userPassword) {
   checkHeader();
 
   // read xref table
   xref = new XRef(str, ownerPassword, userPassword);
   if (!xref->isOk()) {
     error(-1, "Couldn't read xref table");
+    errCode = xref->getErrorCode();
     return gFalse;
   }
 
   // read catalog
   catalog = new Catalog(xref, printCommands);
   if (!catalog->isOk()) {
     error(-1, "Couldn't read page catalog");
+    errCode = errBadCatalog;
     return gFalse;
   }
 
   // done
   return gTrue;
 }
@@ -201,14 +208,15 @@ GBool PDFDoc::isLinearized() {
   Parser *parser;
   Object obj1, obj2, obj3, obj4, obj5;
   GBool lin;
 
   lin = gFalse;
   obj1.initNull();
-  parser = new Parser(xref, new Lexer(xref, str->makeSubStream(str->getStart(),
-                                                               -1, &obj1)));
+  parser = new Parser(xref,
+             new Lexer(xref,
+               str->makeSubStream(str->getStart(), gFalse, 0, &obj1)));
   parser->getObj(&obj1);
   parser->getObj(&obj2);
   parser->getObj(&obj3);
   parser->getObj(&obj4);
   if (obj1.isInt() && obj2.isInt() && obj3.isCmd("obj") &&
       obj4.isDict()) {