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
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
// 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.
