From 12f1eb15ca3fed6310402847559a7c99d3c77847 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sat, 2 Apr 2022 17:14:10 -0400 Subject: Programmatically apply new formatting to code Run this: for i in **/*.cc **/*.c **/*.h **/*.hh; do clang-format < $i >| $i.new && mv $i.new $i done --- libqpdf/QPDFEFStreamObjectHelper.cc | 55 ++++++++++++++----------------------- 1 file changed, 20 insertions(+), 35 deletions(-) (limited to 'libqpdf/QPDFEFStreamObjectHelper.cc') diff --git a/libqpdf/QPDFEFStreamObjectHelper.cc b/libqpdf/QPDFEFStreamObjectHelper.cc index ef44c1c1..de11e30f 100644 --- a/libqpdf/QPDFEFStreamObjectHelper.cc +++ b/libqpdf/QPDFEFStreamObjectHelper.cc @@ -1,13 +1,12 @@ #include -#include -#include #include -#include #include +#include +#include +#include -QPDFEFStreamObjectHelper::QPDFEFStreamObjectHelper( - QPDFObjectHandle oh) : +QPDFEFStreamObjectHelper::QPDFEFStreamObjectHelper(QPDFObjectHandle oh) : QPDFObjectHelper(oh), m(new Members()) { @@ -21,8 +20,7 @@ QPDFObjectHandle QPDFEFStreamObjectHelper::getParam(std::string const& pkey) { auto params = this->oh.getDict().getKey("/Params"); - if (params.isDictionary()) - { + if (params.isDictionary()) { return params.getKey(pkey); } return QPDFObjectHandle::newNull(); @@ -33,8 +31,7 @@ QPDFEFStreamObjectHelper::setParam( std::string const& pkey, QPDFObjectHandle const& pval) { auto params = this->oh.getDict().getKey("/Params"); - if (! params.isDictionary()) - { + if (!params.isDictionary()) { params = QPDFObjectHandle::newDictionary(); this->oh.getDict().replaceKey("/Params", params); } @@ -45,8 +42,7 @@ std::string QPDFEFStreamObjectHelper::getCreationDate() { auto val = getParam("/CreationDate"); - if (val.isString()) - { + if (val.isString()) { return val.getUTF8Value(); } return ""; @@ -56,8 +52,7 @@ std::string QPDFEFStreamObjectHelper::getModDate() { auto val = getParam("/ModDate"); - if (val.isString()) - { + if (val.isString()) { return val.getUTF8Value(); } return ""; @@ -67,8 +62,7 @@ size_t QPDFEFStreamObjectHelper::getSize() { auto val = getParam("/Size"); - if (val.isInteger()) - { + if (val.isInteger()) { return QIntC::to_size(val.getUIntValueAsUInt()); } return 0; @@ -78,11 +72,9 @@ std::string QPDFEFStreamObjectHelper::getSubtype() { auto val = this->oh.getDict().getKey("/Subtype"); - if (val.isName()) - { + if (val.isName()) { auto n = val.getName(); - if (n.length() > 1) - { + if (n.length() > 1) { return n.substr(1); } } @@ -93,23 +85,20 @@ std::string QPDFEFStreamObjectHelper::getChecksum() { auto val = getParam("/CheckSum"); - if (val.isString()) - { + if (val.isString()) { return val.getStringValue(); } return ""; } QPDFEFStreamObjectHelper -QPDFEFStreamObjectHelper::createEFStream( - QPDF& qpdf, PointerHolder data) +QPDFEFStreamObjectHelper::createEFStream(QPDF& qpdf, PointerHolder data) { return newFromStream(QPDFObjectHandle::newStream(&qpdf, data)); } QPDFEFStreamObjectHelper -QPDFEFStreamObjectHelper::createEFStream( - QPDF& qpdf, std::string const& data) +QPDFEFStreamObjectHelper::createEFStream(QPDF& qpdf, std::string const& data) { return newFromStream(QPDFObjectHandle::newStream(&qpdf, data)); } @@ -119,9 +108,8 @@ QPDFEFStreamObjectHelper::createEFStream( QPDF& qpdf, std::function provider) { auto stream = QPDFObjectHandle::newStream(&qpdf); - stream.replaceStreamData(provider, - QPDFObjectHandle::newNull(), - QPDFObjectHandle::newNull()); + stream.replaceStreamData( + provider, QPDFObjectHandle::newNull(), QPDFObjectHandle::newNull()); return newFromStream(stream); } @@ -156,18 +144,15 @@ QPDFEFStreamObjectHelper::newFromStream(QPDFObjectHandle stream) Pl_Discard discard; Pl_MD5 md5("EF md5", &discard); Pl_Count count("EF size", &md5); - if (! stream.pipeStreamData(&count, nullptr, 0, qpdf_dl_all)) - { + if (!stream.pipeStreamData(&count, nullptr, 0, qpdf_dl_all)) { stream.warnIfPossible( "unable to get stream data for new embedded file stream"); - } - else - { + } else { result.setParam( "/Size", QPDFObjectHandle::newInteger(count.getCount())); result.setParam( - "/CheckSum", QPDFObjectHandle::newString( - QUtil::hex_decode(md5.getHexDigest()))); + "/CheckSum", + QPDFObjectHandle::newString(QUtil::hex_decode(md5.getHexDigest()))); } return result; } -- cgit v1.2.3-54-g00ecf