diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-24 01:04:37 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-24 01:04:37 +0000 |
commit | 5a6e0b15bd7ee99932d2ccd389013b37cc1b4c19 (patch) | |
tree | 0cc4a12c0d2fb576ef0b5a3e5d72412ae0a65e93 | |
parent | 566f64b3e7ae7318c2bbc81d79e5c5cd0761f1a0 (diff) | |
parent | 795c25ac5099987647cd8587ba7bdb7d2bb21d59 (diff) | |
download | piex-android13-s1-release.tar.gz |
Snap for 8345013 from 795c25ac5099987647cd8587ba7bdb7d2bb21d59 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-gsi
Change-Id: Ib8698b2cbbbb2963bb3e9fd8985aa020d6de7a53
-rw-r--r-- | src/image_type_recognition/image_type_recognition_lite.cc | 3 | ||||
-rw-r--r-- | src/piex.cc | 4 | ||||
-rw-r--r-- | src/tiff_parser.cc | 4 |
3 files changed, 6 insertions, 5 deletions
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 @@ class ArwTypeChecker : public TypeChecker { // 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 4b868d9..ac2ef0b 100644 --- a/src/piex.cc +++ b/src/piex.cc @@ -283,9 +283,9 @@ bool GetOlympusPreviewImage(StreamInterface* stream, } 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 @@ 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; |