openbsd-ports/print/poppler/patches/patch-poppler_XRef_cc
kili f8fcf38000 Update to poppler-0.16.5.
Gnome introspection disabled for now (doesn't compile with gcc-3).
2011-06-04 19:03:19 +00:00

62 lines
1.9 KiB
Plaintext

$OpenBSD: patch-poppler_XRef_cc,v 1.8 2011/06/04 19:03:19 kili Exp $
--- poppler/XRef.cc.orig Mon Dec 27 21:44:28 2010
+++ poppler/XRef.cc Mon Apr 25 13:00:42 2011
@@ -922,49 +922,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
}
GBool XRef::okToPrint(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permPrint);
+ return gTrue;
}
// we can print at high res if we are only doing security handler revision
// 2 (and we are allowed to print at all), or with security handler rev
// 3 and we are allowed to print, and bit 12 is set.
GBool XRef::okToPrintHighRes(GBool ignoreOwnerPW) {
- if (encrypted) {
- if (2 == encRevision) {
- return (okToPrint(ignoreOwnerPW));
- } else if (encRevision >= 3) {
- return (okToPrint(ignoreOwnerPW) && (permFlags & permHighResPrint));
- } else {
- // something weird - unknown security handler version
- return gFalse;
- }
- } else {
- return gTrue;
- }
+ return gTrue;
}
GBool XRef::okToChange(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permChange);
+ return gTrue;
}
GBool XRef::okToCopy(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permCopy);
+ return gTrue;
}
GBool XRef::okToAddNotes(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permNotes);
+ return gTrue;
}
GBool XRef::okToFillForm(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permFillForm);
+ return gTrue;
}
GBool XRef::okToAccessibility(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permAccessibility);
+ return gTrue;
}
GBool XRef::okToAssemble(GBool ignoreOwnerPW) {
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permAssemble);
+ return gTrue;
}
Object *XRef::fetch(int num, int gen, Object *obj, std::set<int> *fetchOriginatorNums) {