diff options
| author | m-holger <m-holger@kubitscheck.org> | 2022-06-25 16:00:31 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2022-06-25 17:10:06 +0200 |
| commit | 7836e1974726f379b96d980cfa39561cfab2e0ff (patch) | |
| tree | 05df586bf946547b5be3bdaf1fad2bc2e7e8cf3f | |
| parent | 3b3bcab349ace035252d40908d58159d83f4d506 (diff) | |
| download | qpdf-7836e1974726f379b96d980cfa39561cfab2e0ff.tar.zst | |
Code tidy: remove redundant calls to QPDFObjectHandle::isInitialized
| -rw-r--r-- | libqpdf/NNTree.cc | 7 | ||||
| -rw-r--r-- | libqpdf/QPDFFormFieldObjectHelper.cc | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libqpdf/NNTree.cc b/libqpdf/NNTree.cc index a5df209d..94464468 100644 --- a/libqpdf/NNTree.cc +++ b/libqpdf/NNTree.cc @@ -56,8 +56,7 @@ NNTreeIterator::updateIValue(bool allow_invalid) // measure, we also call updateIValue in operator* and operator->. bool okay = false; - if ((item_number >= 0) && this->node.isInitialized() && - this->node.isDictionary()) { + if ((item_number >= 0) && this->node.isDictionary()) { auto items = this->node.getKey(impl.details.itemsKey()); if (this->item_number + 1 < items.getArrayNItems()) { okay = true; @@ -987,10 +986,10 @@ NNTreeImpl::insertFirst(QPDFObjectHandle key, QPDFObjectHandle value) { auto iter = begin(); QPDFObjectHandle items; - if (iter.node.isInitialized() && iter.node.isDictionary()) { + if (iter.node.isDictionary()) { items = iter.node.getKey(details.itemsKey()); } - if (!(items.isInitialized() && items.isArray())) { + if (!(items.isArray())) { QTC::TC("qpdf", "NNTree no valid items node in insertFirst"); error(qpdf, this->oh, "unable to find a valid items node"); } diff --git a/libqpdf/QPDFFormFieldObjectHelper.cc b/libqpdf/QPDFFormFieldObjectHelper.cc index a89b8b82..6373f04f 100644 --- a/libqpdf/QPDFFormFieldObjectHelper.cc +++ b/libqpdf/QPDFFormFieldObjectHelper.cc @@ -878,7 +878,7 @@ QPDFFormFieldObjectHelper::generateTextAppearance( if (!font.isInitialized()) { QPDFObjectHandle dr = getDefaultResources(); font = getFontFromResource(dr, font_name); - found_font_in_dr = (font.isInitialized() && font.isDictionary()); + found_font_in_dr = font.isDictionary(); } if (found_font_in_dr && resources.isDictionary()) { QTC::TC("qpdf", "QPDFFormFieldObjectHelper get font from /DR"); @@ -892,8 +892,7 @@ QPDFFormFieldObjectHelper::generateTextAppearance( resources.getKey("/Font").replaceKey(font_name, font); } - if (font.isInitialized() && font.isDictionary() && - font.getKey("/Encoding").isName()) { + if (font.isDictionary() && font.getKey("/Encoding").isName()) { std::string encoding = font.getKey("/Encoding").getName(); if (encoding == "/WinAnsiEncoding") { QTC::TC("qpdf", "QPDFFormFieldObjectHelper WinAnsi"); |