Synched with Xpdf 0.92

[evince.git] / pdf / xpdf / Object.h

diff --git a/pdf/xpdf/Object.h b/pdf/xpdf/Object.h
index cb7a4180263837e6b6fae740325cb3e376c63333..fa4f740b5ef45b85dbfe2d11df4eb57eafd8f6a1 100644 (file)
--- a/pdf/xpdf/Object.h
+++ b/pdf/xpdf/Object.h
@@ -115,6 +115,7 @@ public:
   void free();
 
   // Type checking.
+  ObjType getType() { return type; }
   GBool isBool() { return type == objBool; }
   GBool isInt() { return type == objInt; }
   GBool isReal() { return type == objReal; }
@@ -172,12 +173,12 @@ public:
   // Stream accessors.
   GBool streamIs(char *dictType);
   void streamReset();
+  void streamClose();
   int streamGetChar();
   int streamLookChar();
   char *streamGetLine(char *buf, int size);
   int streamGetPos();
   void streamSetPos(int pos);
-/*  BaseFile streamGetFile();*/
   Dict *streamGetDict();
 
   // Output.
@@ -275,6 +276,9 @@ inline GBool Object::isStream(char *dictType)
 inline void Object::streamReset()
   { stream->reset(); }
 
+inline void Object::streamClose()
+  { stream->close(); }
+
 inline int Object::streamGetChar()
   { return stream->getChar(); }
 
@@ -290,9 +294,6 @@ inline int Object::streamGetPos()
 inline void Object::streamSetPos(int pos)
   { stream->setPos(pos); }
 
-/*inline BaseFile Object::streamGetFile()
-  { return stream->getFile(); }*/
-
 inline Dict *Object::streamGetDict()
   { return stream->getDict(); }