aboutsummaryrefslogtreecommitdiffstats
path: root/libqpdf
diff options
context:
space:
mode:
Diffstat (limited to 'libqpdf')
-rw-r--r--libqpdf/NNTree.cc12
-rw-r--r--libqpdf/QPDF.cc16
-rw-r--r--libqpdf/QPDFAcroFormDocumentHelper.cc3
-rw-r--r--libqpdf/QPDFFileSpecObjectHelper.cc4
-rw-r--r--libqpdf/QPDFPageLabelDocumentHelper.cc5
-rw-r--r--libqpdf/QPDFPageObjectHelper.cc14
-rw-r--r--libqpdf/QPDF_Stream.cc4
7 files changed, 26 insertions, 32 deletions
diff --git a/libqpdf/NNTree.cc b/libqpdf/NNTree.cc
index 9d4e8ec7..a888f42f 100644
--- a/libqpdf/NNTree.cc
+++ b/libqpdf/NNTree.cc
@@ -341,9 +341,10 @@ NNTreeIterator::split(
first_node.replaceKey(key, first_half);
QPDFObjectHandle new_kids = QPDFObjectHandle::newArray();
new_kids.appendItem(first_node);
- to_split.removeKey("/Limits"); // already shouldn't be there for root
- to_split.removeKey(impl.details.itemsKey());
- to_split.replaceKey("/Kids", new_kids);
+ to_split
+ .removeKey("/Limits") // already shouldn't be there for root
+ .removeKey(impl.details.itemsKey())
+ .replaceKey("/Kids", new_kids);
if (is_leaf) {
QTC::TC("qpdf", "NNTree split root + leaf");
this->node = first_node;
@@ -884,9 +885,8 @@ NNTreeImpl::repair()
for (auto const& i : *this) {
repl.insert(i.first, i.second);
}
- this->oh.replaceKey("/Kids", new_node.getKey("/Kids"));
- this->oh.replaceKey(
- details.itemsKey(), new_node.getKey(details.itemsKey()));
+ this->oh.replaceKey("/Kids", new_node.getKey("/Kids"))
+ .replaceKey(details.itemsKey(), new_node.getKey(details.itemsKey()));
}
NNTreeImpl::iterator
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 309e3461..63feb461 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -2436,13 +2436,11 @@ QPDF::replaceForeignIndirectObjects(
QTC::TC("qpdf", "QPDF replace dictionary");
result = QPDFObjectHandle::newDictionary();
std::set<std::string> keys = foreign.getKeys();
- for (std::set<std::string>::iterator iter = keys.begin();
- iter != keys.end();
- ++iter) {
+ for (auto const& iter : keys) {
result.replaceKey(
- *iter,
+ iter,
replaceForeignIndirectObjects(
- foreign.getKey(*iter), obj_copier, false));
+ foreign.getKey(iter), obj_copier, false));
}
} else if (foreign.isStream()) {
QTC::TC("qpdf", "QPDF replace stream");
@@ -2452,13 +2450,11 @@ QPDF::replaceForeignIndirectObjects(
QPDFObjectHandle dict = result.getDict();
QPDFObjectHandle old_dict = foreign.getDict();
std::set<std::string> keys = old_dict.getKeys();
- for (std::set<std::string>::iterator iter = keys.begin();
- iter != keys.end();
- ++iter) {
+ for (auto const& iter : keys) {
dict.replaceKey(
- *iter,
+ iter,
replaceForeignIndirectObjects(
- old_dict.getKey(*iter), obj_copier, false));
+ old_dict.getKey(iter), obj_copier, false));
}
copyStreamData(result, foreign);
} else {
diff --git a/libqpdf/QPDFAcroFormDocumentHelper.cc b/libqpdf/QPDFAcroFormDocumentHelper.cc
index 2bb52f44..811570b5 100644
--- a/libqpdf/QPDFAcroFormDocumentHelper.cc
+++ b/libqpdf/QPDFAcroFormDocumentHelper.cc
@@ -748,8 +748,7 @@ QPDFAcroFormDocumentHelper::adjustAppearanceStream(
auto existing_old = subdict.getKey(old_key);
if (!existing_old.isNull()) {
QTC::TC("qpdf", "QPDFAcroFormDocumentHelper ap rename");
- subdict.replaceKey(new_key, existing_old);
- subdict.removeKey(old_key);
+ subdict.replaceKey(new_key, existing_old).removeKey(old_key);
}
}
}
diff --git a/libqpdf/QPDFFileSpecObjectHelper.cc b/libqpdf/QPDFFileSpecObjectHelper.cc
index 0c7653b6..446ff131 100644
--- a/libqpdf/QPDFFileSpecObjectHelper.cc
+++ b/libqpdf/QPDFFileSpecObjectHelper.cc
@@ -103,8 +103,8 @@ QPDFFileSpecObjectHelper::createFileSpec(
QPDFFileSpecObjectHelper result(oh);
result.setFilename(filename);
auto ef = QPDFObjectHandle::newDictionary();
- ef.replaceKey("/F", efsoh.getObjectHandle());
- ef.replaceKey("/UF", efsoh.getObjectHandle());
+ ef.replaceKey("/F", efsoh.getObjectHandle())
+ .replaceKey("/UF", efsoh.getObjectHandle());
oh.replaceKey("/EF", ef);
return result;
}
diff --git a/libqpdf/QPDFPageLabelDocumentHelper.cc b/libqpdf/QPDFPageLabelDocumentHelper.cc
index babfd5aa..8f3472c1 100644
--- a/libqpdf/QPDFPageLabelDocumentHelper.cc
+++ b/libqpdf/QPDFPageLabelDocumentHelper.cc
@@ -44,9 +44,8 @@ QPDFPageLabelDocumentHelper::getLabelForPage(long long page_idx)
QIntC::range_check(start, offset);
start += offset;
result = QPDFObjectHandle::newDictionary();
- result.replaceKey("/S", S);
- result.replaceKey("/P", P);
- result.replaceKey("/St", QPDFObjectHandle::newInteger(start));
+ result.replaceKey("/S", S).replaceKey("/P", P).replaceKey(
+ "/St", QPDFObjectHandle::newInteger(start));
return result;
}
diff --git a/libqpdf/QPDFPageObjectHelper.cc b/libqpdf/QPDFPageObjectHelper.cc
index a6773e70..ce0bcc38 100644
--- a/libqpdf/QPDFPageObjectHelper.cc
+++ b/libqpdf/QPDFPageObjectHelper.cc
@@ -78,8 +78,8 @@ QPDFObjectHandle
InlineImageTracker::convertIIDict(QPDFObjectHandle odict)
{
QPDFObjectHandle dict = QPDFObjectHandle::newDictionary();
- dict.replaceKey("/Type", QPDFObjectHandle::newName("/XObject"));
- dict.replaceKey("/Subtype", QPDFObjectHandle::newName("/Image"));
+ dict.replaceKey("/Type", QPDFObjectHandle::newName("/XObject"))
+ .replaceKey("/Subtype", QPDFObjectHandle::newName("/Image"));
std::set<std::string> keys = odict.getKeys();
for (auto key : keys) {
QPDFObjectHandle value = odict.getKey(key);
@@ -752,11 +752,11 @@ QPDFPageObjectHelper::getFormXObjectForPage(bool handle_transformations)
}
QPDFObjectHandle result = QPDFObjectHandle::newStream(qpdf);
QPDFObjectHandle newdict = result.getDict();
- newdict.replaceKey("/Type", QPDFObjectHandle::newName("/XObject"));
- newdict.replaceKey("/Subtype", QPDFObjectHandle::newName("/Form"));
- newdict.replaceKey(
- "/Resources", getAttribute("/Resources", false).shallowCopy());
- newdict.replaceKey("/Group", getAttribute("/Group", false).shallowCopy());
+ newdict.replaceKey("/Type", QPDFObjectHandle::newName("/XObject"))
+ .replaceKey("/Subtype", QPDFObjectHandle::newName("/Form"))
+ .replaceKey(
+ "/Resources", getAttribute("/Resources", false).shallowCopy())
+ .replaceKey("/Group", getAttribute("/Group", false).shallowCopy());
QPDFObjectHandle bbox = getTrimBox(false).shallowCopy();
if (!bbox.isRectangle()) {
this->oh.warnIfPossible("bounding box is invalid; form"
diff --git a/libqpdf/QPDF_Stream.cc b/libqpdf/QPDF_Stream.cc
index 2d0554b9..9e1c1ca6 100644
--- a/libqpdf/QPDF_Stream.cc
+++ b/libqpdf/QPDF_Stream.cc
@@ -604,8 +604,8 @@ QPDF_Stream::replaceFilterData(
QPDFObjectHandle const& decode_parms,
size_t length)
{
- this->stream_dict.replaceKey("/Filter", filter);
- this->stream_dict.replaceKey("/DecodeParms", decode_parms);
+ this->stream_dict.replaceKey("/Filter", filter)
+ .replaceKey("/DecodeParms", decode_parms);
if (length == 0) {
QTC::TC("qpdf", "QPDF_Stream unknown stream length");
this->stream_dict.removeKey("/Length");
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-01 17:55:14 +0200