kill traces of ltk, incorporate new sources

[evince.git] / pdf / xpdf / XRef.cc

diff --git a/pdf/xpdf/XRef.cc b/pdf/xpdf/XRef.cc
index 0e1bbc9c6c620a4162cc2e7609fcad89bc1122e1..901caa596b3acd7cb9f56a28e8e4a1406664046a 100644 (file)
--- a/pdf/xpdf/XRef.cc
+++ b/pdf/xpdf/XRef.cc
@@ -6,11 +6,12 @@
 //
 //========================================================================
 
-#ifdef __GNUC__
+#include <aconf.h>
+
+#ifdef USE_GCC_PRAGMAS
 #pragma implementation
 #endif
 
-#include <aconf.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
@@ -454,6 +455,7 @@ GBool XRef::checkEncrypted(GString *ownerPassword, GString *userPassword) {
   ret = gFalse;
 
   permFlags = defPermFlags;
+  ownerPasswordOk = gFalse;
   trailerDict.dictLookup("Encrypt", &encrypt);
   if ((encrypted1 = encrypt.isDict())) {
     ret = gTrue;