diff options
author | Jesse Evans <jsje@google.com> | 2022-03-23 01:50:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-23 01:50:04 +0000 |
commit | d7e8bf23374eb6168267701f245b68755fabcba4 (patch) | |
tree | 0cc4a12c0d2fb576ef0b5a3e5d72412ae0a65e93 /src/tiff_parser.cc | |
parent | 643bfcfad48b932c3ef9d2f34e5704600e310544 (diff) | |
parent | 795c25ac5099987647cd8587ba7bdb7d2bb21d59 (diff) | |
download | piex-d7e8bf23374eb6168267701f245b68755fabcba4.tar.gz |
Update PIEX from tip of tree am: 79ea86a6a1 am: 3f7e2a1cb2 am: 940f4ce6b5 am: 795c25ac50
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/2037563
Change-Id: I6b29c8c201ab6ec004c0e98c7e90adfae64c6479
Diffstat (limited to 'src/tiff_parser.cc')
-rw-r--r-- | src/tiff_parser.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tiff_parser.cc b/src/tiff_parser.cc index ac6d006..3ceaa75 100644 --- a/src/tiff_parser.cc +++ b/src/tiff_parser.cc @@ -720,8 +720,8 @@ bool TiffParser::ParseIfd(const std::uint32_t ifd_offset, IfdVector* tiff_directory) { std::uint32_t next_ifd_offset; TiffDirectory tiff_ifd(static_cast<Endian>(endian_)); - if (!ParseDirectory(tiff_offset_, ifd_offset, endian_, desired_tags, - stream_, &tiff_ifd, &next_ifd_offset) || + 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)) { return false; |