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. --- examples/pdf-create.cc | 5 ++--- examples/pdf-invert-images.cc | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/pdf-create.cc b/examples/pdf-create.cc index 44405d38..199584fe 100644 --- a/examples/pdf-create.cc +++ b/examples/pdf-create.cc @@ -290,15 +290,14 @@ static void check(char const* filename, QPDFObjectHandle color_space = image_dict.getKey("/ColorSpace"); QPDFObjectHandle filter = image_dict.getKey("/Filter"); bool this_errors = false; - if (! (filter.isName() && (filter.getName() == desired_filter))) + if (! filter.isNameAndEquals(desired_filter)) { this_errors = errors = true; std::cout << "page " << pageno << ": expected filter " << desired_filter << "; actual filter = " << filter.unparse() << std::endl; } - if (! (color_space.isName() && - (color_space.getName() == desired_color_space))) + if (! color_space.isNameAndEquals(desired_color_space)) { this_errors = errors = true; std::cout << "page " << pageno << ": expected color space " diff --git a/examples/pdf-invert-images.cc b/examples/pdf-invert-images.cc index bb8541e3..b410bca5 100644 --- a/examples/pdf-invert-images.cc +++ b/examples/pdf-invert-images.cc @@ -167,9 +167,8 @@ int main(int argc, char* argv[]) // keys to determine the image type. if (image.pipeStreamData(0, qpdf_ef_compress, qpdf_dl_all) && - color_space.isName() && + color_space.isNameAndEquals("/DeviceGray") && bits_per_component.isInteger() && - (color_space.getName() == "/DeviceGray") && (bits_per_component.getIntValue() == 8)) { inv->registerImage(image, p); -- cgit v1.2.3-54-g00ecf