From 07db3200cb0ef058b8a66ece8d9757adfba49fd1 Mon Sep 17 00:00:00 2001 From: m-holger Date: Wed, 26 Jan 2022 08:00:23 +0000 Subject: Remove some if statements and simplify some boolean expressions Use QPDFObjectHandle::isNameAndEquals, isDictionaryOfType and isStreamOfType. --- libqpdf/QPDF_encryption.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libqpdf/QPDF_encryption.cc') diff --git a/libqpdf/QPDF_encryption.cc b/libqpdf/QPDF_encryption.cc index 2ff48df9..9607a598 100644 --- a/libqpdf/QPDF_encryption.cc +++ b/libqpdf/QPDF_encryption.cc @@ -1262,9 +1262,7 @@ QPDF::decryptStream(PointerHolder encp, { QPDFObjectHandle decode_parms = stream_dict.getKey("/DecodeParms"); - if (decode_parms.getKey("/Type").isName() && - (decode_parms.getKey("/Type").getName() == - "/CryptFilterDecodeParms")) + if (decode_parms.isDictionaryOfType("/CryptFilterDecodeParms")) { QTC::TC("qpdf", "QPDF_encryption stream crypt filter"); method = interpretCF(encp, decode_parms.getKey("/Name")); @@ -1280,8 +1278,7 @@ QPDF::decryptStream(PointerHolder encp, { for (int i = 0; i < filter.getArrayNItems(); ++i) { - if (filter.getArrayItem(i).isName() && - (filter.getArrayItem(i).getName() == "/Crypt")) + if (filter.getArrayItem(i).isNameAndEquals("/Crypt")) { QPDFObjectHandle crypt_params = decode.getArrayItem(i); -- cgit v1.2.3-54-g00ecf