summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2012-02-05 23:07:57 +0100
committerAlbert Astals Cid <aacid@kde.org>2012-02-05 23:07:57 +0100
commitb4dc6eb4571ce5914e8e14931ca69c2d622aa8ce (patch)
tree93d99a758408b2ead6bd1a15bd1187492471efc5
parentf8c94d251321b4e411d4f0e04f944b6f0f5d84b9 (diff)
This was already merged in
-rw-r--r--ALL_DIFF9
1 files changed, 0 insertions, 9 deletions
diff --git a/ALL_DIFF b/ALL_DIFF
index 1909340..9829490 100644
--- a/ALL_DIFF
+++ b/ALL_DIFF
@@ -98,15 +98,6 @@ diff -ru xpdf-3.02/xpdf/PDFDoc.cc xpdf-3.03/xpdf/PDFDoc.cc
// authorization succeeded
xref->setEncryption(secHdlr->getPermissionFlags(),
secHdlr->getOwnerPasswordOk(),
-@@ -315,7 +383,7 @@
- printf("***** page %d *****\n", page);
- }
- catalog->getPage(page)->display(out, hDPI, vDPI,
-- rotate, useMediaBox, crop, printing, catalog,
-+ rotate, useMediaBox, crop, printing,
- abortCheckCbk, abortCheckCbkData);
- }
-
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