third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add SonyMisc(2b|3c) Groups in TIFF files

Browse Source 
- Previous version only supported JPEGs.
- Update Python test to use more specific grep, as this prevents
  SonyMisc(2b|3c) from being included. Regression test to be added
  in a different commit.
This commit is contained in:
postscript-dev 2021-09-23 11:40:29 +01:00
parent 7d2eb4ad09
commit 7ace96263e
No known key found for this signature in database
GPG Key ID: F3EC02A099292862
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/makernote_int.cpp
View File

@ -1231,8 +1231,16 @@ namespace Exiv2 {
{
// From Exiftool: https://github.com/exiftool/exiftool/blob/master/lib/Image/ExifTool/Sony.pm
// > First byte must be 9 or 12 or 13 or 15 or 16 and 4th byte must be 2 (deciphered)
const auto value = getExifValue(pRoot, 0x9404, Exiv2::Internal::sony1Id);
if (!value || value->count() < 4)
// Get the value from the image format that is being used
auto value = getExifValue(pRoot, 0x9404, Exiv2::Internal::sony1Id);
if (!value) {
value = getExifValue(pRoot, 0x9404, Exiv2::Internal::sony2Id);
if (!value)
return -1;
}
if (value->count() < 4)
return -1;
switch (value->toLong(0)) { // Using encrypted values
@ -1251,8 +1259,16 @@ namespace Exiv2 {
{
// From Exiftool (Tag 9400c): https://github.com/exiftool/exiftool/blob/master/lib/Image/ExifTool/Sony.pm
// > first byte decoded: 62, 48, 215, 28, 106 respectively
const auto value = getExifValue(pRoot, 0x9400, Exiv2::Internal::sony1Id);
if (!value || value->count() < 1)
// Get the value from the image format that is being used
auto value = getExifValue(pRoot, 0x9400, Exiv2::Internal::sony1Id);
if (!value) {
value = getExifValue(pRoot, 0x9400, Exiv2::Internal::sony2Id);
if (!value)
return -1;
}
if (value->count() < 1)
return -1;
switch (value->toLong()) { // Using encrypted values

2
tests/bugfixes/redmine/test_issue_1153.py
View File

@ -16,7 +16,7 @@ class CheckSony6000WithoutLensModels(metaclass=system_tests.CaseMeta):
]
commands = [
"$exiv2 -pa -g Lens {!s}".format(fname) for fname in filenames
"$exiv2 -pa -g LensSpecification -g LensModel -g LensID {!s}".format(fname) for fname in filenames
]
stdout = [