Bring back okTo{Print,Change,Copy,AddNotes} diffs, which I

dropped by accident.
This commit is contained in:
kili 2009-10-25 12:45:53 +00:00
parent 3bfccf6ba8
commit bc12b40d5f
2 changed files with 29 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.87 2009/10/15 15:50:25 kili Exp $
# $OpenBSD: Makefile,v 1.88 2009/10/25 12:45:53 kili Exp $
COMMENT-main = K Desktop Environment, graphic applications
COMMENT-kamera = KDE interface to digital cameras
@ -14,7 +14,7 @@ SEPARATE_BUILD = flavored
MULTI_PACKAGES = -main -kpov -kamera -sane
PKGNAME = ${DISTNAME}
PKGNAME-main = ${DISTNAME}p3
PKGNAME-main = ${DISTNAME}p4
PKGNAME-kamera = kamera-${VERSION}p3
PKGNAME-kpov = kpovmodeller-${VERSION}p2
PKGNAME-sane = ksane-${VERSION}p3

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-kpdf_xpdf_xpdf_XRef_cc,v 1.2 2009/10/15 15:50:25 kili Exp $
--- kpdf/xpdf/xpdf/XRef.cc.orig Thu Oct 15 16:32:56 2009
+++ kpdf/xpdf/xpdf/XRef.cc Thu Oct 15 16:35:46 2009
$OpenBSD: patch-kpdf_xpdf_xpdf_XRef_cc,v 1.3 2009/10/25 12:45:53 kili Exp $
--- kpdf/xpdf/xpdf/XRef.cc.orig Mon May 14 09:39:30 2007
+++ kpdf/xpdf/xpdf/XRef.cc Sun Oct 25 13:04:29 2009
@@ -52,6 +52,8 @@ class ObjectStream { (public)
// generation 0.
ObjectStream(XRef *xref, int objStrNumA);
@ -52,6 +52,30 @@ $OpenBSD: patch-kpdf_xpdf_xpdf_XRef_cc,v 1.2 2009/10/15 15:50:25 kili Exp $
}
ObjectStream::~ObjectStream() {
@@ -771,19 +782,19 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
}
GBool XRef::okToPrint(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permPrint);
+ return (1);
}
GBool XRef::okToChange(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permChange);
+ return (1);
}
GBool XRef::okToCopy(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permCopy);
+ return (1);
}
GBool XRef::okToAddNotes(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permNotes);
+ return (1);
}
Object *XRef::fetch(int num, int gen, Object *obj) {
@@ -837,6 +848,11 @@ Object *XRef::fetch(int num, int gen, Object *obj) {
delete objStr;
}