upgraded to xpdf-3.01pl1

[swftools.git] / pdf2swf / xpdf / XRef.h

diff --git a/pdf2swf/xpdf/XRef.h b/pdf2swf/xpdf/XRef.h
index bec487a..f9dede3 100644 (file)
--- a/pdf2swf/xpdf/XRef.h
+++ b/pdf2swf/xpdf/XRef.h
@@ -43,7 +43,7 @@ class XRef {
 public:
 
   // Constructor.  Read xref table from stream.
-  XRef(BaseStream *strA, GString *ownerPassword, GString *userPassword);
+  XRef(BaseStream *strA);
 
   // Destructor.
   ~XRef();
@@ -54,12 +54,12 @@ public:
   // Get the error code (if isOk() returns false).
   int getErrorCode() { return errCode; }
 
+  // Set the encryption parameters.
+  void setEncryption(int permFlagsA, GBool ownerPasswordOkA,
+                    Guchar *fileKeyA, int keyLengthA, int encVersionA);
+
   // Is the file encrypted?
-#ifndef NO_DECRYPTION
   GBool isEncrypted() { return encrypted; }
-#else
-  GBool isEncrypted() { return gFalse; }
-#endif
 
   // Check various permissions.
   GBool okToPrint(GBool ignoreOwnerPW = gFalse);
@@ -112,15 +112,12 @@ private:
                                //   damaged files
   int streamEndsLen;           // number of valid entries in streamEnds
   ObjectStream *objStr;                // cached object stream
-#ifndef NO_DECRYPTION
   GBool encrypted;             // true if file is encrypted
-  int encVersion;              // encryption algorithm
-  int encRevision;             // security handler revision
-  int keyLength;               // length of key, in bytes
   int permFlags;               // permission bits
-  Guchar fileKey[16];          // file decryption key
   GBool ownerPasswordOk;       // true if owner password is correct
-#endif
+  Guchar fileKey[16];          // file decryption key
+  int keyLength;               // length of key, in bytes
+  int encVersion;              // encryption algorithm
 
   Guint getStartXref();
   GBool readXRef(Guint *pos);
@@ -128,7 +125,6 @@ private:
   GBool readXRefStreamSection(Stream *xrefStr, int *w, int first, int n);
   GBool readXRefStream(Stream *xrefStr, Guint *pos);
   GBool constructXRef();
-  GBool checkEncrypted(GString *ownerPassword, GString *userPassword);
   Guint strToUnsigned(char *s);
 };