aboutsummaryrefslogtreecommitdiff
path: root/src/image_type_recognition
diff options
context:
space:
mode:
authorJesse Evans <jsje@google.com>2022-03-22 12:53:25 -0700
committerJesse Evans <jsje@google.com>2022-03-22 13:47:22 -0700
commit79ea86a6a1e3da72ffc916ab57a66df5415a4590 (patch)
tree0cc4a12c0d2fb576ef0b5a3e5d72412ae0a65e93 /src/image_type_recognition
parent3e08a5ae1d34ad578c779c07973158b37d358352 (diff)
downloadpiex-79ea86a6a1e3da72ffc916ab57a66df5415a4590.tar.gz
Update PIEX from tip of tree
Add support for Sony ARW 4.0. Fix overflow issue in GetOlympusPreviewImage. Fix issue with Canon RP raw CR3 files. Test: Ran internal tests and eng verified Change-Id: Ib2b9a76f657fd84158f143aa383f07ac0726e932
Diffstat (limited to 'src/image_type_recognition')
-rw-r--r--src/image_type_recognition/image_type_recognition_lite.cc3
1 files changed, 2 insertions, 1 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) {