diff options
| author | Nick Chusid <nchusid@google.com> | 2021-06-23 18:49:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-23 18:49:02 +0000 |
| commit | 643bfcfad48b932c3ef9d2f34e5704600e310544 (patch) | |
| tree | b6fd20680008774313804a590ef75584ab3485da /src/tiff_parser.cc | |
| parent | bba661d47d773d88e070b1fd058aee5cac468cc7 (diff) | |
| parent | 3e08a5ae1d34ad578c779c07973158b37d358352 (diff) | |
| download | piex-643bfcfad48b932c3ef9d2f34e5704600e310544.tar.gz | |
Fix build failures and accept clang suggestions am: ff6a5f9dc9 am: 66026efeeb am: 9dae596dd3 am: 3e08a5ae1d
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1730751
Change-Id: Ie6d7d225f0e3c87504aa2591ca9674cfb45307ab
Diffstat (limited to 'src/tiff_parser.cc')
| -rw-r--r-- | src/tiff_parser.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/tiff_parser.cc b/src/tiff_parser.cc index fc63461..ac6d006 100644 --- a/src/tiff_parser.cc +++ b/src/tiff_parser.cc @@ -27,7 +27,6 @@ namespace { using tiff_directory::Endian; using tiff_directory::Rational; -using tiff_directory::SRational; using tiff_directory::SizeOfType; using tiff_directory::TIFF_TYPE_LONG; using tiff_directory::TIFF_TYPE_UNDEFINED; @@ -396,8 +395,8 @@ bool GetImageData(const TiffDirectory& tiff_directory, StreamInterface* stream, default: return false; } - length = static_cast<std::uint32_t>( - std::accumulate(strip_byte_counts.begin(), strip_byte_counts.end(), 0)); + length = static_cast<std::uint32_t>(std::accumulate( + strip_byte_counts.begin(), strip_byte_counts.end(), 0U)); offset = strip_offsets[0]; } else if (tiff_directory.Has(kPanaTagJpegImage)) { if (!tiff_directory.GetOffsetAndLength( @@ -715,13 +714,13 @@ bool TiffParser::Parse(const TagSet& desired_tags, return true; } -bool TiffParser::ParseIfd(const std::uint32_t offset_to_ifd, +bool TiffParser::ParseIfd(const std::uint32_t ifd_offset, const TagSet& desired_tags, const std::uint16_t max_number_ifds, IfdVector* tiff_directory) { std::uint32_t next_ifd_offset; TiffDirectory tiff_ifd(static_cast<Endian>(endian_)); - if (!ParseDirectory(tiff_offset_, offset_to_ifd, endian_, desired_tags, + if (!ParseDirectory(tiff_offset_, ifd_offset, endian_, desired_tags, stream_, &tiff_ifd, &next_ifd_offset) || !ParseSubIfds(tiff_offset_, desired_tags, max_number_ifds, endian_, stream_, &tiff_ifd)) { |