diff options
author | Nick Chusid <nchusid@google.com> | 2021-06-23 18:30:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-23 18:30:00 +0000 |
commit | 3e08a5ae1d34ad578c779c07973158b37d358352 (patch) | |
tree | b6fd20680008774313804a590ef75584ab3485da | |
parent | 0dbd4e41281585bf43b7a0572abebd8070506a18 (diff) | |
parent | 9dae596dd356b3fd878d88b836b68ea4836294d9 (diff) | |
download | piex-3e08a5ae1d34ad578c779c07973158b37d358352.tar.gz |
Fix build failures and accept clang suggestions am: ff6a5f9dc9 am: 66026efeeb am: 9dae596dd3
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1730751
Change-Id: I46f07a3503de49f2c09af96f8a4c8b681ff433b1
-rw-r--r-- | src/piex_cr3.cc | 10 | ||||
-rw-r--r-- | src/tiff_parser.cc | 9 | ||||
-rw-r--r-- | src/tiff_parser.h | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/piex_cr3.cc b/src/piex_cr3.cc index 1e9a50a..4fa82b7 100644 --- a/src/piex_cr3.cc +++ b/src/piex_cr3.cc @@ -41,7 +41,7 @@ constexpr Uuid kUuidPrvw = {0xea, 0xf4, 0x2b, 0x5e, 0x1c, 0x98, 0x4b, 0x88, 0xb9, 0xfb, 0xb7, 0xdc, 0x40, 0x6e, 0x4d, 0x16}; constexpr size_t kTagSize = 4; -using BoxTag = std::array<std::uint8_t, kTagSize>; +using BoxTag = std::array<char, kTagSize>; constexpr BoxTag NewTag(const char s[kTagSize + 1]) { return BoxTag{s[0], s[1], s[2], s[3]}; @@ -232,8 +232,8 @@ Box GetNextBox(StreamInterface* stream, size_t offset) { return Box(); } BoxTag tag; - Error status = - stream->GetData(offset + sizeof(length_32), kTagSize, tag.data()); + Error status = stream->GetData(offset + sizeof(length_32), kTagSize, + reinterpret_cast<std::uint8_t*>(tag.data())); if (status != kOk) { return Box(); } @@ -531,7 +531,7 @@ bool IsImage(StreamInterface* stream, const Image& image) { Error Cr3GetPreviewData(StreamInterface* stream, PreviewImageData* preview_image_data) { - ProcessData data{preview_image_data}; + ProcessData data{.preview_image_data = preview_image_data}; if (!ProcessStream(stream, kMdatTag, &data)) { return kFail; } @@ -548,7 +548,7 @@ Error Cr3GetPreviewData(StreamInterface* stream, bool Cr3GetOrientation(StreamInterface* stream, std::uint32_t* orientation) { PreviewImageData preview_image_data; - ProcessData data{&preview_image_data}; + ProcessData data{.preview_image_data = &preview_image_data}; if (ProcessStream(stream, kCmt1Tag, &data)) { *orientation = preview_image_data.exif_orientation; return true; 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)) { diff --git a/src/tiff_parser.h b/src/tiff_parser.h index f89c319..e19dea2 100644 --- a/src/tiff_parser.h +++ b/src/tiff_parser.h @@ -184,7 +184,7 @@ class TiffParser { // Runs over the Tiff IFD, Exif IFD and subIFDs to get the preview image data. // Returns false if something with the Tiff tags is wrong. bool GetPreviewImageData(const TiffContent& tiff_content, - PreviewImageData* image_metadata); + PreviewImageData* preview_image_data); // Returns false if called more that once or something with the Tiff data is // wrong. |