Snap for 8400301 from 02ca75d3cb3169efdc502b73d548a4f9a5fb61e5 to t-keystone-qcom-release
Change-Id: I0ff213e4a21b60e56f6f6eb418c8cc02b41f23ff
diff --git a/src/image_type_recognition/image_type_recognition_lite.cc b/src/image_type_recognition/image_type_recognition_lite.cc
index cb32e1c..5976f42 100644
--- a/src/image_type_recognition/image_type_recognition_lite.cc
+++ b/src/image_type_recognition/image_type_recognition_lite.cc
@@ -183,13 +183,14 @@
// Search for (kSignatureFileTypeSection + kSignatureVersions[i]) in first
// requested bytes
const string kSignatureSection("\x00\xb0\x01\x00\x04\x00\x00\x00", 8);
- const int kSignatureVersionsSize = 5;
+ const int kSignatureVersionsSize = 6;
const string kSignatureVersions[kSignatureVersionsSize] = {
string("\x02\x00", 2), // ARW 1.0
string("\x03\x00", 2), // ARW 2.0
string("\x03\x01", 2), // ARW 2.1
string("\x03\x02", 2), // ARW 2.2
string("\x03\x03", 2), // ARW 2.3
+ string("\x04\x00", 2), // ARW 4.0
};
bool matched = false;
for (int i = 0; i < kSignatureVersionsSize; ++i) {
diff --git a/src/piex.cc b/src/piex.cc
index eda345d..c800266 100644
--- a/src/piex.cc
+++ b/src/piex.cc
@@ -283,9 +283,9 @@
}
if (raw_processing_ifd.Has(kOlymTagAspectFrame)) {
- std::vector<std::uint32_t> aspect_frame(4);
+ std::vector<std::uint32_t> aspect_frame;
if (raw_processing_ifd.Get(kOlymTagAspectFrame, &aspect_frame) &&
- aspect_frame[2] > aspect_frame[0] &&
+ aspect_frame.size() == 4 && aspect_frame[2] > aspect_frame[0] &&
aspect_frame[3] > aspect_frame[1]) {
preview_image_data->full_width = aspect_frame[2] - aspect_frame[0] + 1;
preview_image_data->full_height = aspect_frame[3] - aspect_frame[1] + 1;
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 @@
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;