diff options
author | Albert Astals Cid <aacid@kde.org> | 2012-02-05 23:09:11 +0100 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2012-02-05 23:09:11 +0100 |
commit | 44f40de623e98e626e117b0a955dc4fc58b21790 (patch) | |
tree | 5a3322a102c06dc20bc6204865dff0b777269cab | |
parent | b4dc6eb4571ce5914e8e14931ca69c2d622aa8ce (diff) |
Merged in 548648b
-rw-r--r-- | ALL_DIFF | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -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 |