Fixed vicious bug in stream stuff, should work now.

1 files changed, 35 insertions, 17 deletions

diff --git a/pdf/xpdf/Stream.h b/pdf/xpdf/Stream.h
index 06af0d7..33d7317 100644
--- a/pdf/xpdf/Stream.h
+++ b/pdf/xpdf/Stream.h
@@ -83,10 +83,13 @@ public:
   virtual Stream *getBaseStream() = 0;
 
   // Get a substream of this stream.
-  virtual Stream *subStream (int start1, int length1, Object *dict1) = 0;
+  virtual Stream *subStream(int start1, int length1, Object *dict1) = 0;
 
   // Get start offset of a stream's data.
-  virtual int     getStart  () = 0;
+  virtual int getStart() = 0;
+
+  // Whether we failed to load ?
+  virtual GBool isOk() = 0;
 
   // Get the dictionary associated with this stream.
   virtual Dict *getDict() = 0;
@@ -181,7 +184,9 @@ private:
 extern FILE *fileOpen (GString *fileName1);
 
 class FileStream: public Stream {
-public:
+ private:
+  FileStream();
+ public:
   FileStream(FILE *f1);
   virtual ~FileStream();
   virtual StreamKind getKind() { return strFile; }
@@ -195,10 +200,11 @@ public:
   virtual GBool isBinary(GBool last = gTrue) { return last; }
   virtual Stream *getBaseStream() { return this; }
   virtual Stream *subStream (int start1, int length1, Object *dict1);
-  virtual int     getStart  () { return start; }
+  virtual int getStart() { return start; }
+  virtual GBool isOk()  { return f != NULL; }
   virtual Dict *getDict() { return dict.getDict(); }
 
-private:
+ private:
 
   GBool fillBuf();
   GBool checkHeader();
@@ -232,7 +238,8 @@ public:
   virtual Stream *getBaseStream() { return this; }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return dict.getDict(); }
 
 private:
@@ -261,7 +268,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
 
 private:
@@ -291,7 +299,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
 
 private:
@@ -324,7 +333,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
 
 private:
@@ -368,7 +378,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
 
 private:
@@ -406,7 +417,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
 
 private:
@@ -475,7 +487,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
   Stream *getRawStream() { return str; }
 
@@ -568,7 +581,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
 
 private:
@@ -624,7 +638,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
 
 private:
@@ -651,7 +666,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
   virtual GBool isEncoder() { return gTrue; }
 
@@ -683,7 +699,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
   virtual GBool isEncoder() { return gTrue; }
 
@@ -720,7 +737,8 @@ public:
   virtual Stream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *subStream (int start1, int length1, Object *dict1)
     { return str->subStream (start1, length1, dict1); }
-  virtual int     getStart  () { return str->getStart (); }
+  virtual int getStart() { return str->getStart(); }
+  virtual GBool isOk()   { return str->isOk(); }
   virtual Dict *getDict() { return str->getDict(); }
   virtual GBool isEncoder() { return gTrue; }