From 44f40de623e98e626e117b0a955dc4fc58b21790 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sun, 5 Feb 2012 23:09:11 +0100
Subject: Merged in 548648b

---
 ALL_DIFF | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/ALL_DIFF b/ALL_DIFF
index 9829490..bb49249 100644
--- a/ALL_DIFF
+++ b/ALL_DIFF
@@ -86,18 +86,6 @@ diff -ru xpdf-3.02/xpdf/PDFDoc.cc xpdf-3.03/xpdf/PDFDoc.cc
    return gTrue;
  }
  
-@@ -280,7 +345,10 @@
-   xref->getTrailerDict()->dictLookup("Encrypt", &encrypt);
-   if ((encrypted = encrypt.isDict())) {
-     if ((secHdlr = SecurityHandler::make(this, &encrypt))) {
--      if (secHdlr->checkEncryption(ownerPassword, userPassword)) {
-+      if (secHdlr->isUnencrypted()) {
-+	// no encryption
-+	ret = gTrue;
-+      } else if (secHdlr->checkEncryption(ownerPassword, userPassword)) {
- 	// authorization succeeded
-        	xref->setEncryption(secHdlr->getPermissionFlags(),
- 			    secHdlr->getOwnerPasswordOk(),
 diff -ru xpdf-3.02/xpdf/PDFDoc.h xpdf-3.03/xpdf/PDFDoc.h
 --- xpdf-3.02/xpdf/PDFDoc.h	2007-02-27 23:05:52.000000000 +0100
 +++ xpdf-3.03/xpdf/PDFDoc.h	2011-08-15 23:08:53.000000000 +0200
-- 
cgit v1.2.3