OpenSystemsDevelopment / qpdf

Commit 320bbb9854a225d9e26ff2a2b42054b48a23b9fe

Authored by m-holger
1 parent acd0acf1

Code tidy - Clang-Tidy rule modernize-return-braced-init-list

Inline Side-by-side
Showing 14 changed files with 67 additions and 69 deletions
include/qpdf/QPDFOutlineObjectHelper.hh
  View file @320bbb9
... ... @@ -81,7 +81,7 @@ class QPDFOutlineObjectHelper: public QPDFObjectHelper
81 81 static QPDFOutlineObjectHelper
82 82 create(QPDFObjectHandle oh, QPDFOutlineDocumentHelper& dh, int depth)
83 83 {
84   - return QPDFOutlineObjectHelper(oh, dh, depth);
  84 + return {oh, dh, depth};
85 85 }
86 86 };
87 87  
... ...
libqpdf/InputSource.cc
  View file @320bbb9
... ... @@ -37,7 +37,7 @@ InputSource::readLine(size_t max_line_length)
37 37 if (line_length < max_line_length) {
38 38 buf[line_length] = '\0';
39 39 }
40   - return std::string(buf);
  40 + return {buf};
41 41 }
42 42  
43 43 bool
... ...
libqpdf/JSON.cc
  View file @320bbb9
... ... @@ -269,7 +269,7 @@ JSON::encode_string(std::string const&amp; str)
269 269 JSON
270 270 JSON::makeDictionary()
271 271 {
272   - return JSON(std::make_unique<JSON_dictionary>());
  272 + return {std::make_unique<JSON_dictionary>()};
273 273 }
274 274  
275 275 JSON
... ... @@ -299,7 +299,7 @@ JSON::checkDictionaryKeySeen(std::string const&amp; key)
299 299 JSON
300 300 JSON::makeArray()
301 301 {
302   - return JSON(std::make_unique<JSON_array>());
  302 + return {std::make_unique<JSON_array>()};
303 303 }
304 304  
305 305 JSON
... ... @@ -320,43 +320,43 @@ JSON::addArrayElement(JSON const&amp; val)
320 320 JSON
321 321 JSON::makeString(std::string const& utf8)
322 322 {
323   - return JSON(std::make_unique<JSON_string>(utf8));
  323 + return {std::make_unique<JSON_string>(utf8)};
324 324 }
325 325  
326 326 JSON
327 327 JSON::makeInt(long long int value)
328 328 {
329   - return JSON(std::make_unique<JSON_number>(value));
  329 + return {std::make_unique<JSON_number>(value)};
330 330 }
331 331  
332 332 JSON
333 333 JSON::makeReal(double value)
334 334 {
335   - return JSON(std::make_unique<JSON_number>(value));
  335 + return {std::make_unique<JSON_number>(value)};
336 336 }
337 337  
338 338 JSON
339 339 JSON::makeNumber(std::string const& encoded)
340 340 {
341   - return JSON(std::make_unique<JSON_number>(encoded));
  341 + return {std::make_unique<JSON_number>(encoded)};
342 342 }
343 343  
344 344 JSON
345 345 JSON::makeBool(bool value)
346 346 {
347   - return JSON(std::make_unique<JSON_bool>(value));
  347 + return {std::make_unique<JSON_bool>(value)};
348 348 }
349 349  
350 350 JSON
351 351 JSON::makeNull()
352 352 {
353   - return JSON(std::make_unique<JSON_null>());
  353 + return {std::make_unique<JSON_null>()};
354 354 }
355 355  
356 356 JSON
357 357 JSON::makeBlob(std::function<void(Pipeline*)> fn)
358 358 {
359   - return JSON(std::make_unique<JSON_blob>(fn));
  359 + return {std::make_unique<JSON_blob>(fn)};
360 360 }
361 361  
362 362 bool
... ...
libqpdf/NNTree.cc
  View file @320bbb9
... ... @@ -689,7 +689,7 @@ NNTreeImpl::begin()
689 689 NNTreeImpl::iterator
690 690 NNTreeImpl::end()
691 691 {
692   - return iterator(*this);
  692 + return {*this};
693 693 }
694 694  
695 695 NNTreeImpl::iterator
... ...
libqpdf/QPDF.cc
  View file @320bbb9
... ... @@ -2212,7 +2212,7 @@ QPDF::getVersionAsPDFVersion()
2212 2212 minor = QUtil::string_to_int(match[2].str().c_str());
2213 2213 }
2214 2214  
2215   - return PDFVersion(major, minor, extension_level);
  2215 + return {major, minor, extension_level};
2216 2216 }
2217 2217  
2218 2218 std::string
... ... @@ -2483,7 +2483,7 @@ QPDF::damagedPDF(
2483 2483 qpdf_offset_t offset,
2484 2484 std::string const& message)
2485 2485 {
2486   - return QPDFExc(qpdf_e_damaged_pdf, input->getName(), object, offset, message);
  2486 + return {qpdf_e_damaged_pdf, input->getName(), object, offset, message};
2487 2487 }
2488 2488  
2489 2489 // Return an exception of type qpdf_e_damaged_pdf. The object is taken from
... ... @@ -2499,7 +2499,7 @@ QPDF::damagedPDF(
2499 2499 QPDFExc
2500 2500 QPDF::damagedPDF(std::string const& object, qpdf_offset_t offset, std::string const& message)
2501 2501 {
2502   - return QPDFExc(qpdf_e_damaged_pdf, m->file->getName(), object, offset, message);
  2502 + return {qpdf_e_damaged_pdf, m->file->getName(), object, offset, message};
2503 2503 }
2504 2504  
2505 2505 // Return an exception of type qpdf_e_damaged_pdf. The filename is taken from m->file and the
... ...
libqpdf/QPDFCrypto_openssl.cc
  View file @320bbb9
... ... @@ -194,7 +194,7 @@ QPDFCrypto_openssl::MD5_digest(MD5_Digest d)
194 194 std::string
195 195 QPDFCrypto_openssl::SHA2_digest()
196 196 {
197   - return std::string(reinterpret_cast<char*>(md_out), sha2_bits / 8);
  197 + return {reinterpret_cast<char*>(md_out), sha2_bits / 8};
198 198 }
199 199  
200 200 void
... ...
libqpdf/QPDFJob.cc
  View file @320bbb9
... ... @@ -428,7 +428,7 @@ QPDFJob::parseNumrange(char const* range, int max)
428 428 } catch (std::runtime_error& e) {
429 429 usage(e.what());
430 430 }
431   - return std::vector<int>();
  431 + return {};
432 432 }
433 433  
434 434 std::unique_ptr<QPDF>
... ...
libqpdf/QPDFMatrix.cc
  View file @320bbb9
... ... @@ -57,7 +57,7 @@ QPDFMatrix::unparse() const
57 57 QPDFObjectHandle::Matrix
58 58 QPDFMatrix::getAsMatrix() const
59 59 {
60   - return QPDFObjectHandle::Matrix(a, b, c, d, e, f);
  60 + return {a, b, c, d, e, f};
61 61 }
62 62  
63 63 void
... ... @@ -124,11 +124,11 @@ QPDFMatrix::transformRectangle(QPDFObjectHandle::Rectangle r) const
124 124 transform(r.llx, r.ury, tx.at(1), ty.at(1));
125 125 transform(r.urx, r.lly, tx.at(2), ty.at(2));
126 126 transform(r.urx, r.ury, tx.at(3), ty.at(3));
127   - return QPDFObjectHandle::Rectangle(
  127 + return {
128 128 *std::min_element(tx.begin(), tx.end()),
129 129 *std::min_element(ty.begin(), ty.end()),
130 130 *std::max_element(tx.begin(), tx.end()),
131   - *std::max_element(ty.begin(), ty.end()));
  131 + *std::max_element(ty.begin(), ty.end())};
132 132 }
133 133  
134 134 bool
... ...
libqpdf/QPDFNameTreeObjectHelper.cc
  View file @320bbb9
... ... @@ -54,8 +54,7 @@ QPDFNameTreeObjectHelper::QPDFNameTreeObjectHelper(QPDFObjectHandle oh, QPDF&amp; q,
54 54 QPDFNameTreeObjectHelper
55 55 QPDFNameTreeObjectHelper::newEmpty(QPDF& qpdf, bool auto_repair)
56 56 {
57   - return QPDFNameTreeObjectHelper(
58   - qpdf.makeIndirectObject("<< /Names [] >>"_qpdf), qpdf, auto_repair);
  57 + return {qpdf.makeIndirectObject("<< /Names [] >>"_qpdf), qpdf, auto_repair};
59 58 }
60 59  
61 60 QPDFNameTreeObjectHelper::iterator::iterator(std::shared_ptr<NNTreeIterator> const& i) :
... ... @@ -135,33 +134,33 @@ QPDFNameTreeObjectHelper::iterator::remove()
135 134 QPDFNameTreeObjectHelper::iterator
136 135 QPDFNameTreeObjectHelper::begin() const
137 136 {
138   - return iterator(std::make_shared<NNTreeIterator>(m->impl->begin()));
  137 + return {std::make_shared<NNTreeIterator>(m->impl->begin())};
139 138 }
140 139  
141 140 QPDFNameTreeObjectHelper::iterator
142 141 QPDFNameTreeObjectHelper::end() const
143 142 {
144   - return iterator(std::make_shared<NNTreeIterator>(m->impl->end()));
  143 + return {std::make_shared<NNTreeIterator>(m->impl->end())};
145 144 }
146 145  
147 146 QPDFNameTreeObjectHelper::iterator
148 147 QPDFNameTreeObjectHelper::last() const
149 148 {
150   - return iterator(std::make_shared<NNTreeIterator>(m->impl->last()));
  149 + return {std::make_shared<NNTreeIterator>(m->impl->last())};
151 150 }
152 151  
153 152 QPDFNameTreeObjectHelper::iterator
154 153 QPDFNameTreeObjectHelper::find(std::string const& key, bool return_prev_if_not_found)
155 154 {
156 155 auto i = m->impl->find(QPDFObjectHandle::newUnicodeString(key), return_prev_if_not_found);
157   - return iterator(std::make_shared<NNTreeIterator>(i));
  156 + return {std::make_shared<NNTreeIterator>(i)};
158 157 }
159 158  
160 159 QPDFNameTreeObjectHelper::iterator
161 160 QPDFNameTreeObjectHelper::insert(std::string const& key, QPDFObjectHandle value)
162 161 {
163 162 auto i = m->impl->insert(QPDFObjectHandle::newUnicodeString(key), value);
164   - return iterator(std::make_shared<NNTreeIterator>(i));
  163 + return {std::make_shared<NNTreeIterator>(i)};
165 164 }
166 165  
167 166 bool
... ...
libqpdf/QPDFNumberTreeObjectHelper.cc
  View file @320bbb9
... ... @@ -56,8 +56,7 @@ QPDFNumberTreeObjectHelper::QPDFNumberTreeObjectHelper(
56 56 QPDFNumberTreeObjectHelper
57 57 QPDFNumberTreeObjectHelper::newEmpty(QPDF& qpdf, bool auto_repair)
58 58 {
59   - return QPDFNumberTreeObjectHelper(
60   - qpdf.makeIndirectObject("<< /Nums [] >>"_qpdf), qpdf, auto_repair);
  59 + return {qpdf.makeIndirectObject("<< /Nums [] >>"_qpdf), qpdf, auto_repair};
61 60 }
62 61  
63 62 QPDFNumberTreeObjectHelper::iterator::iterator(std::shared_ptr<NNTreeIterator> const& i) :
... ... @@ -137,33 +136,33 @@ QPDFNumberTreeObjectHelper::iterator::remove()
137 136 QPDFNumberTreeObjectHelper::iterator
138 137 QPDFNumberTreeObjectHelper::begin() const
139 138 {
140   - return iterator(std::make_shared<NNTreeIterator>(m->impl->begin()));
  139 + return {std::make_shared<NNTreeIterator>(m->impl->begin())};
141 140 }
142 141  
143 142 QPDFNumberTreeObjectHelper::iterator
144 143 QPDFNumberTreeObjectHelper::end() const
145 144 {
146   - return iterator(std::make_shared<NNTreeIterator>(m->impl->end()));
  145 + return {std::make_shared<NNTreeIterator>(m->impl->end())};
147 146 }
148 147  
149 148 QPDFNumberTreeObjectHelper::iterator
150 149 QPDFNumberTreeObjectHelper::last() const
151 150 {
152   - return iterator(std::make_shared<NNTreeIterator>(m->impl->last()));
  151 + return {std::make_shared<NNTreeIterator>(m->impl->last())};
153 152 }
154 153  
155 154 QPDFNumberTreeObjectHelper::iterator
156 155 QPDFNumberTreeObjectHelper::find(numtree_number key, bool return_prev_if_not_found)
157 156 {
158 157 auto i = m->impl->find(QPDFObjectHandle::newInteger(key), return_prev_if_not_found);
159   - return iterator(std::make_shared<NNTreeIterator>(i));
  158 + return {std::make_shared<NNTreeIterator>(i)};
160 159 }
161 160  
162 161 QPDFNumberTreeObjectHelper::iterator
163 162 QPDFNumberTreeObjectHelper::insert(numtree_number key, QPDFObjectHandle value)
164 163 {
165 164 auto i = m->impl->insert(QPDFObjectHandle::newInteger(key), value);
166   - return iterator(std::make_shared<NNTreeIterator>(i));
  165 + return {std::make_shared<NNTreeIterator>(i)};
167 166 }
168 167  
169 168 bool
... ...
libqpdf/QPDFObjectHandle.cc
  View file @320bbb9
... ... @@ -752,7 +752,7 @@ QPDFObjectHandle::getValueAsInlineImage(std::string&amp; value)
752 752 QPDFObjectHandle::QPDFArrayItems
753 753 QPDFObjectHandle::aitems()
754 754 {
755   - return QPDFArrayItems(*this);
  755 + return *this;
756 756 }
757 757  
758 758 int
... ... @@ -826,11 +826,11 @@ QPDFObjectHandle::getArrayAsRectangle()
826 826 return {};
827 827 }
828 828 }
829   - return Rectangle(
  829 + return {
830 830 std::min(items[0], items[2]),
831 831 std::min(items[1], items[3]),
832 832 std::max(items[0], items[2]),
833   - std::max(items[1], items[3]));
  833 + std::max(items[1], items[3])};
834 834 }
835 835 return {};
836 836 }
... ... @@ -848,7 +848,7 @@ QPDFObjectHandle::getArrayAsMatrix()
848 848 return {};
849 849 }
850 850 }
851   - return Matrix(items[0], items[1], items[2], items[3], items[4], items[5]);
  851 + return {items[0], items[1], items[2], items[3], items[4], items[5]};
852 852 }
853 853 return {};
854 854 }
... ... @@ -959,7 +959,7 @@ QPDFObjectHandle::eraseItemAndGetOld(int at)
959 959 QPDFObjectHandle::QPDFDictItems
960 960 QPDFObjectHandle::ditems()
961 961 {
962   - return QPDFDictItems(*this);
  962 + return {*this};
963 963 }
964 964  
965 965 bool
... ... @@ -1862,61 +1862,61 @@ QPDFObjectHandle::getParsedOffset()
1862 1862 QPDFObjectHandle
1863 1863 QPDFObjectHandle::newBool(bool value)
1864 1864 {
1865   - return QPDFObjectHandle(QPDF_Bool::create(value));
  1865 + return {QPDF_Bool::create(value)};
1866 1866 }
1867 1867  
1868 1868 QPDFObjectHandle
1869 1869 QPDFObjectHandle::newNull()
1870 1870 {
1871   - return QPDFObjectHandle(QPDF_Null::create());
  1871 + return {QPDF_Null::create()};
1872 1872 }
1873 1873  
1874 1874 QPDFObjectHandle
1875 1875 QPDFObjectHandle::newInteger(long long value)
1876 1876 {
1877   - return QPDFObjectHandle(QPDF_Integer::create(value));
  1877 + return {QPDF_Integer::create(value)};
1878 1878 }
1879 1879  
1880 1880 QPDFObjectHandle
1881 1881 QPDFObjectHandle::newReal(std::string const& value)
1882 1882 {
1883   - return QPDFObjectHandle(QPDF_Real::create(value));
  1883 + return {QPDF_Real::create(value)};
1884 1884 }
1885 1885  
1886 1886 QPDFObjectHandle
1887 1887 QPDFObjectHandle::newReal(double value, int decimal_places, bool trim_trailing_zeroes)
1888 1888 {
1889   - return QPDFObjectHandle(QPDF_Real::create(value, decimal_places, trim_trailing_zeroes));
  1889 + return {QPDF_Real::create(value, decimal_places, trim_trailing_zeroes)};
1890 1890 }
1891 1891  
1892 1892 QPDFObjectHandle
1893 1893 QPDFObjectHandle::newName(std::string const& name)
1894 1894 {
1895   - return QPDFObjectHandle(QPDF_Name::create(name));
  1895 + return {QPDF_Name::create(name)};
1896 1896 }
1897 1897  
1898 1898 QPDFObjectHandle
1899 1899 QPDFObjectHandle::newString(std::string const& str)
1900 1900 {
1901   - return QPDFObjectHandle(QPDF_String::create(str));
  1901 + return {QPDF_String::create(str)};
1902 1902 }
1903 1903  
1904 1904 QPDFObjectHandle
1905 1905 QPDFObjectHandle::newUnicodeString(std::string const& utf8_str)
1906 1906 {
1907   - return QPDFObjectHandle(QPDF_String::create_utf16(utf8_str));
  1907 + return {QPDF_String::create_utf16(utf8_str)};
1908 1908 }
1909 1909  
1910 1910 QPDFObjectHandle
1911 1911 QPDFObjectHandle::newOperator(std::string const& value)
1912 1912 {
1913   - return QPDFObjectHandle(QPDF_Operator::create(value));
  1913 + return {QPDF_Operator::create(value)};
1914 1914 }
1915 1915  
1916 1916 QPDFObjectHandle
1917 1917 QPDFObjectHandle::newInlineImage(std::string const& value)
1918 1918 {
1919   - return QPDFObjectHandle(QPDF_InlineImage::create(value));
  1919 + return {QPDF_InlineImage::create(value)};
1920 1920 }
1921 1921  
1922 1922 QPDFObjectHandle
... ... @@ -1928,7 +1928,7 @@ QPDFObjectHandle::newArray()
1928 1928 QPDFObjectHandle
1929 1929 QPDFObjectHandle::newArray(std::vector<QPDFObjectHandle> const& items)
1930 1930 {
1931   - return QPDFObjectHandle(QPDF_Array::create(items));
  1931 + return {QPDF_Array::create(items)};
1932 1932 }
1933 1933  
1934 1934 QPDFObjectHandle
... ... @@ -1995,7 +1995,7 @@ QPDFObjectHandle::newDictionary()
1995 1995 QPDFObjectHandle
1996 1996 QPDFObjectHandle::newDictionary(std::map<std::string, QPDFObjectHandle> const& items)
1997 1997 {
1998   - return QPDFObjectHandle(QPDF_Dictionary::create(items));
  1998 + return {QPDF_Dictionary::create(items)};
1999 1999 }
2000 2000  
2001 2001 QPDFObjectHandle
... ... @@ -2060,7 +2060,7 @@ QPDFObjectHandle::shallowCopy()
2060 2060 if (!dereference()) {
2061 2061 throw std::logic_error("operation attempted on uninitialized QPDFObjectHandle");
2062 2062 }
2063   - return QPDFObjectHandle(obj->copy());
  2063 + return {obj->copy()};
2064 2064 }
2065 2065  
2066 2066 QPDFObjectHandle
... ... @@ -2069,7 +2069,7 @@ QPDFObjectHandle::unsafeShallowCopy()
2069 2069 if (!dereference()) {
2070 2070 throw std::logic_error("operation attempted on uninitialized QPDFObjectHandle");
2071 2071 }
2072   - return QPDFObjectHandle(obj->copy(true));
  2072 + return {obj->copy(true)};
2073 2073 }
2074 2074  
2075 2075 void
... ... @@ -2471,13 +2471,13 @@ QPDFObjectHandle::QPDFDictItems::iterator::Members::Members(QPDFObjectHandle&amp; oh
2471 2471 QPDFObjectHandle::QPDFDictItems::iterator
2472 2472 QPDFObjectHandle::QPDFDictItems::begin()
2473 2473 {
2474   - return iterator(oh, true);
  2474 + return {oh, true};
2475 2475 }
2476 2476  
2477 2477 QPDFObjectHandle::QPDFDictItems::iterator
2478 2478 QPDFObjectHandle::QPDFDictItems::end()
2479 2479 {
2480   - return iterator(oh, false);
  2480 + return {oh, false};
2481 2481 }
2482 2482  
2483 2483 QPDFObjectHandle::QPDFArrayItems::QPDFArrayItems(QPDFObjectHandle const& oh) :
... ... @@ -2551,13 +2551,13 @@ QPDFObjectHandle::QPDFArrayItems::iterator::Members::Members(QPDFObjectHandle&amp; o
2551 2551 QPDFObjectHandle::QPDFArrayItems::iterator
2552 2552 QPDFObjectHandle::QPDFArrayItems::begin()
2553 2553 {
2554   - return iterator(oh, true);
  2554 + return {oh, true};
2555 2555 }
2556 2556  
2557 2557 QPDFObjectHandle::QPDFArrayItems::iterator
2558 2558 QPDFObjectHandle::QPDFArrayItems::end()
2559 2559 {
2560   - return iterator(oh, false);
  2560 + return {oh, false};
2561 2561 }
2562 2562  
2563 2563 QPDFObjGen
... ...
libqpdf/QPDFPageObjectHelper.cc
  View file @320bbb9
... ... @@ -662,7 +662,7 @@ QPDFPageObjectHelper::shallowCopyPage()
662 662 QPDF& qpdf =
663 663 this->oh.getQPDF("QPDFPageObjectHelper::shallowCopyPage called with a direct object");
664 664 QPDFObjectHandle new_page = this->oh.shallowCopy();
665   - return QPDFPageObjectHelper(qpdf.makeIndirectObject(new_page));
  665 + return {qpdf.makeIndirectObject(new_page)};
666 666 }
667 667  
668 668 QPDFObjectHandle::Matrix
... ... @@ -758,7 +758,7 @@ QPDFPageObjectHelper::getMatrixForFormXObjectPlacement(
758 758 QPDFObjectHandle fdict = fo.getDict();
759 759 QPDFObjectHandle bbox_obj = fdict.getKey("/BBox");
760 760 if (!bbox_obj.isRectangle()) {
761   - return QPDFMatrix();
  761 + return {};
762 762 }
763 763  
764 764 QPDFMatrix wmatrix; // work matrix
... ... @@ -793,7 +793,7 @@ QPDFPageObjectHelper::getMatrixForFormXObjectPlacement(
793 793 // Calculate a scale factor, if needed. Shrink or expand if needed and allowed.
794 794 if ((T.urx == T.llx) || (T.ury == T.lly)) {
795 795 // avoid division by zero
796   - return QPDFMatrix();
  796 + return {};
797 797 }
798 798 double rect_w = rect.urx - rect.llx;
799 799 double rect_h = rect.ury - rect.lly;
... ...
libqpdf/QPDF_encryption.cc
  View file @320bbb9
... ... @@ -164,7 +164,7 @@ pad_or_truncate_password_V4(std::string const&amp; password)
164 164 {
165 165 char k1[key_bytes];
166 166 pad_or_truncate_password_V4(password, k1);
167   - return std::string(k1, key_bytes);
  167 + return {k1, key_bytes};
168 168 }
169 169  
170 170 static std::string
... ... @@ -235,7 +235,7 @@ process_with_aes(
235 235 } else {
236 236 outlength = std::min(outlength, bufp->getSize());
237 237 }
238   - return std::string(reinterpret_cast<char*>(bufp->getBuffer()), outlength);
  238 + return {reinterpret_cast<char*>(bufp->getBuffer()), outlength};
239 239 }
240 240  
241 241 static std::string
... ... @@ -355,7 +355,7 @@ QPDF::compute_data_key(
355 355 md5.encodeDataIncrementally(result.c_str(), result.length());
356 356 MD5::Digest digest;
357 357 md5.digest(digest);
358   - return std::string(reinterpret_cast<char*>(digest), std::min(result.length(), toS(16)));
  358 + return {reinterpret_cast<char*>(digest), std::min(result.length(), toS(16))};
359 359 }
360 360  
361 361 std::string
... ... @@ -401,7 +401,7 @@ QPDF::compute_encryption_key_from_password(std::string const&amp; password, Encrypti
401 401 MD5::Digest digest;
402 402 int key_len = std::min(toI(sizeof(digest)), data.getLengthBytes());
403 403 iterate_md5_digest(md5, digest, ((data.getR() >= 3) ? 50 : 0), key_len);
404   - return std::string(reinterpret_cast<char*>(digest), toS(key_len));
  404 + return {reinterpret_cast<char*>(digest), toS(key_len)};
405 405 }
406 406  
407 407 static void
... ... @@ -448,7 +448,7 @@ compute_O_value(
448 448 data.getLengthBytes(),
449 449 (data.getR() >= 3) ? 20 : 1,
450 450 false);
451   - return std::string(upass, key_bytes);
  451 + return {upass, key_bytes};
452 452 }
453 453  
454 454 static std::string
... ... @@ -467,7 +467,7 @@ compute_U_value_R2(std::string const&amp; user_password, QPDF::EncryptionData const&amp;
467 467 data.getLengthBytes(),
468 468 1,
469 469 false);
470   - return std::string(udata, key_bytes);
  470 + return {udata, key_bytes};
471 471 }
472 472  
473 473 static std::string
... ... @@ -496,7 +496,7 @@ compute_U_value_R3(std::string const&amp; user_password, QPDF::EncryptionData const&amp;
496 496 for (unsigned int i = sizeof(MD5::Digest); i < key_bytes; ++i) {
497 497 result[i] = static_cast<char>((i * i) % 0xff);
498 498 }
499   - return std::string(result, key_bytes);
  499 + return {result, key_bytes};
500 500 }
501 501  
502 502 static std::string
... ...
libqpdf/QUtil.cc
  View file @320bbb9
... ... @@ -903,14 +903,14 @@ QUtil::get_current_qpdf_time()
903 903 // Don't know how to get timezone on this platform
904 904 int tzoff = 0;
905 905 # endif
906   - return QPDFTime(
  906 + return {
907 907 static_cast<int>(ltime.tm_year + 1900),
908 908 static_cast<int>(ltime.tm_mon + 1),
909 909 static_cast<int>(ltime.tm_mday),
910 910 static_cast<int>(ltime.tm_hour),
911 911 static_cast<int>(ltime.tm_min),
912 912 static_cast<int>(ltime.tm_sec),
913   - tzoff);
  913 + tzoff};
914 914 #endif
915 915 }
916 916  
... ...