add parameters providing allocation width and height without scrollbars

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

diff --git a/pdf/xpdf/Parser.h b/pdf/xpdf/Parser.h
index 1e2c117785b8230af75a35eecb0e2afb85866d8c..3bc3ab27408755e9f1e662d4a458ee211dc56803 100644 (file)
--- a/pdf/xpdf/Parser.h
+++ b/pdf/xpdf/Parser.h
@@ -2,14 +2,16 @@
 //
 // Parser.h
 //
-// Copyright 1996 Derek B. Noonburg
+// Copyright 1996-2003 Glyph & Cog, LLC
 //
 //========================================================================
 
 #ifndef PARSER_H
 #define PARSER_H
 
-#ifdef __GNUC__
+#include <aconf.h>
+
+#ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
 
@@ -23,13 +25,19 @@ class Parser {
 public:
 
   // Constructor.
-  Parser(Lexer *lexer1);
+  Parser(XRef *xrefA, Lexer *lexerA);
 
   // Destructor.
   ~Parser();
 
   // Get the next object from the input stream.
+#ifndef NO_DECRYPTION
+  Object *getObj(Object *obj,
+                Guchar *fileKey = NULL, int keyLength = 0,
+                int objNum = 0, int objGen = 0);
+#else
   Object *getObj(Object *obj);
+#endif
 
   // Get stream.
   Stream *getStream() { return lexer->getStream(); }
@@ -39,6 +47,7 @@ public:
 
 private:
 
+  XRef *xref;                  // the xref table for this PDF file
   Lexer *lexer;                        // input stream
   Object buf1, buf2;           // next two tokens
   int inlineImg;               // set when inline image data is encountered