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

Merge pull request #1129 from Exiv2/fix_1105_0.27

Browse Source 
Fix 1105 0.27
This commit is contained in:
Robin Mills 2020-03-30 13:58:32 +01:00 committed by GitHub
commit f646d8ea47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nikonmn_int.cpp
View File

@ -2541,6 +2541,8 @@ fmountlens[] = {
{0xf4,0x4c,0x7c,0x7c,0x2c,0x2c,0x4b,0x02,0x00,0x00,0x00, "Sigma", "", "APO MACRO 180mm F3.5 EX DG"},
// https://github.com/Exiv2/exiv2/issues/1078
{0x80,0x48,0x1C,0x29,0x24,0x24,0x7A,0x06,0x00,0x00,0x00, "Tokina", "", "atx-i 11-16mm F2.8 CF"},
// https://github.com/Exiv2/exiv2/pull/1105
{0xCB,0x3C,0x2B,0x44,0x24,0x31,0xDF,0x46,0x00,0x00,0x00, "Tamron", "A037", "17-35mm F/2.8-4 Di OSD"},
//
{0,0,0,0,0,0,0,0,0,0,0, NULL, NULL, NULL}
};

BIN
test/data/exiv2-pr1105.exv Normal file
View File

Binary file not shown.

18
tests/bugfixes/github/test_pr_1105.py Normal file
View File

@ -0,0 +1,18 @@
# -*- coding: utf-8 -*-
from system_tests import CaseMeta, path
class Tamron_17_35_Di_OSD(metaclass=CaseMeta):
filename = path("$data_path/exiv2-pr1105.exv")
commands = ["$exiv2 -pa --grep lens/i $filename"]
stdout = ["""Exif.Nikon3.LensType Byte 1 D G
Exif.Nikon3.Lens Rational 4 17-35mm F2.8-4
Exif.Nikon3.LensFStops Undefined 4 5
Exif.NikonLd3.LensIDNumber Byte 1 Tamron 17-35mm F/2.8-4 Di OSD
Exif.NikonLd3.LensFStops Byte 1 F5.0
"""
]
stderr = [""]
retval = [0]