@@ -1199,7 +1199,7 @@ size_t TiffEntryBase::doWriteImage(IoWrapper& /*ioWrapper*/, ByteOrder /*byteOrd
11991199} // TiffEntryBase::doWriteImage
12001200
12011201size_t TiffSubIfd::doWriteImage (IoWrapper& ioWrapper, ByteOrder byteOrder) const {
1202- return std::transform_reduce (ifds_.begin (), ifds_.end (), size_t {0 }, std::plus<> (),
1202+ return std::transform_reduce (ifds_.begin (), ifds_.end (), size_t {}, std::plus (),
12031203 [&](const auto & ifd) { return ifd->writeImage (ioWrapper, byteOrder); });
12041204} // TiffSubIfd::doWriteImage
12051205
@@ -1365,7 +1365,7 @@ size_t TiffDataEntry::doSizeData() const {
13651365}
13661366
13671367size_t TiffSubIfd::doSizeData () const {
1368- return std::transform_reduce (ifds_.begin (), ifds_.end (), size_t {0 }, std::plus<> (), std::mem_fn (&TiffSubIfd::size));
1368+ return std::transform_reduce (ifds_.begin (), ifds_.end (), size_t {}, std::plus (), std::mem_fn (&TiffSubIfd::size));
13691369}
13701370
13711371size_t TiffIfdMakernote::doSizeData () const {
@@ -1378,13 +1378,12 @@ size_t TiffComponent::sizeImage() const {
13781378
13791379size_t TiffDirectory::doSizeImage () const {
13801380 size_t len = pNext_ ? pNext_->sizeImage () : 0 ;
1381- return std::transform_reduce (components_.begin (), components_.end (), len, std::plus<> (),
1381+ return std::transform_reduce (components_.begin (), components_.end (), len, std::plus (),
13821382 std::mem_fn (&TiffDirectory::sizeImage));
13831383}
13841384
13851385size_t TiffSubIfd::doSizeImage () const {
1386- return std::transform_reduce (ifds_.begin (), ifds_.end (), size_t {0 }, std::plus<>(),
1387- std::mem_fn (&TiffSubIfd::sizeImage));
1386+ return std::transform_reduce (ifds_.begin (), ifds_.end (), size_t {}, std::plus (), std::mem_fn (&TiffSubIfd::sizeImage));
13881387} // TiffSubIfd::doSizeImage
13891388
13901389size_t TiffIfdMakernote::doSizeImage () const {
@@ -1399,10 +1398,11 @@ size_t TiffImageEntry::doSizeImage() const {
13991398 if (!pValue ())
14001399 return 0 ;
14011400 auto len = pValue ()->sizeDataArea ();
1402- if (len == 0 )
1403- return std::transform_reduce (strips_.begin (), strips_.end (), len, std::plus<>(),
1404- [](const auto & s) { return s.second ; });
1405- return len;
1401+ if (len != 0 )
1402+ return len;
1403+
1404+ return std::transform_reduce (strips_.begin (), strips_.end (), len, std::plus (),
1405+ [](const auto & s) { return s.second ; });
14061406} // TiffImageEntry::doSizeImage
14071407
14081408static const TagInfo* findTagInfo (uint16_t tag, IfdId group) {
0 commit comments