upgraded to xpdf-3.01pl1

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

diff --git a/pdf2swf/xpdf/Decrypt.h b/pdf2swf/xpdf/Decrypt.h
index 52afb2f..2beba58 100644 (file)
--- a/pdf2swf/xpdf/Decrypt.h
+++ b/pdf2swf/xpdf/Decrypt.h
@@ -2,14 +2,16 @@
 //
 // Decrypt.h
 //
-// Copyright 1996-2002 Glyph & Cog, LLC
+// Copyright 1996-2003 Glyph & Cog, LLC
 //
 //========================================================================
 
 #ifndef DECRYPT_H
 #define DECRYPT_H
 
-#ifdef __GNUC__
+#include <aconf.h>
+
+#ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
 
@@ -41,14 +43,16 @@ public:
                           GString *ownerKey, GString *userKey,
                           int permissions, GString *fileID,
                           GString *ownerPassword, GString *userPassword,
-                          Guchar *fileKey, GBool *ownerPasswordOk);
+                          Guchar *fileKey, GBool encryptMetadata,
+                          GBool *ownerPasswordOk);
 
 private:
 
   static GBool makeFileKey2(int encVersion, int encRevision, int keyLength,
                            GString *ownerKey, GString *userKey,
                            int permissions, GString *fileID,
-                           GString *userPassword, Guchar *fileKey);
+                           GString *userPassword, Guchar *fileKey,
+                           GBool encryptMetadata);
 
   int objKeyLength;
   Guchar objKey[21];