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

correct identification for Tamron SP 24-70mm G2 A032 (#1691)

Browse Source 
* correct identification for Tamron SP 24-70mm G2 A032 with LensType 0E (14)

Existing entry with LensType 4E is kept as it's needed as well
Added testcase for LensType 0E for Tamron_SP_24-70mm_F2.8_Di_VC_USD_G2
This commit is contained in:
nulllinie 2021-06-10 09:01:38 +02:00 committed by GitHub
parent a6b1126f6d
commit 23dbf4f51a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nikonmn_int.cpp
View File

@ -2372,6 +2372,7 @@ fmountlens[] = {
{0xFE,0x48,0x37,0x5C,0x24,0x24,0xDF,0x0E,0x01,0x00,0x00, "Tamron", "A007", "SP 24-70mm F/2.8 Di VC USD"},
//M "Tamron" "73D" "AF 24-70mm F/3.3-5.6 Aspherical";
{0xCE,0x47,0x37,0x5C,0x25,0x25,0xDF,0x4E,0x00,0x00,0x00, "Tamron", "A032", "SP 24-70mm F/2.8 Di VC USD G2"},
{0xCE,0x47,0x37,0x5C,0x25,0x25,0xDF,0x0E,0x00,0x00,0x00, "Tamron", "A032", "SP 24-70mm F/2.8 Di VC USD G2"},
{0x45,0x41,0x37,0x72,0x2C,0x3C,0x48,0x02,0x00,0x00,0x00, "Tamron", "190D", "SP AF 24-135mm F/3.5-5.6 AD Aspherical (IF) Macro"},
//M "Tamron" "159D" "AF 28-70mm F/3.5-4.5";
//M "Tamron" "259D" "AF 28-70mm F/3.5-4.5";

BIN
test/data/Tamron_SP_24-70mm_F2.8_Di_VC_USD_G2_0E.exv Normal file
View File

Binary file not shown.

20
tests/bugfixes/github/test_pr_1691.py Normal file
View File

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
from system_tests import CaseMeta, path
class Tamron_SP_24_70mm_F28_Di_VC_USD_G2_0E(metaclass=CaseMeta):
url = "https://github.com/Exiv2/exiv2/pull/1691"
filename = path("$data_path/Tamron_SP_24-70mm_F2.8_Di_VC_USD_G2_0E.exv")
commands = ["$exiv2 -pa --grep lens/i $filename"]
stderr = [""]
stdout = ["""Exif.Nikon3.LensType Byte 1 D G VR
Exif.Nikon3.Lens Rational 4 24-70mm F2.8
Exif.Nikon3.LensFStops Undefined 4 5.91667
Exif.NikonLd3.LensIDNumber Byte 1 Tamron SP 24-70mm F/2.8 Di VC USD G2
Exif.NikonLd3.LensFStops Byte 1 F5.9
"""
]
stderr = [""]
retval = [0]