diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 5a8d1239..8d732a62 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -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/issues/1069 +{0xc8,0x54,0x44,0x44,0x0d,0x0d,0xdf,0x46,0x00,0x00,0x00, "Tamron", "F045", "SP 35mm f/1.4 Di USD"}, // 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"}, // diff --git a/test/data/Tamron_SP_35mm_f1.4_Di_USD_F045.exv b/test/data/Tamron_SP_35mm_f1.4_Di_USD_F045.exv new file mode 100644 index 00000000..1e2b5a0c Binary files /dev/null and b/test/data/Tamron_SP_35mm_f1.4_Di_USD_F045.exv differ diff --git a/tests/bugfixes/github/test_issue_1069.py b/tests/bugfixes/github/test_issue_1069.py new file mode 100644 index 00000000..5c4cf4cc --- /dev/null +++ b/tests/bugfixes/github/test_issue_1069.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- + +import system_tests + +class NikonTamronLens_F045_35_F14(metaclass=system_tests.CaseMeta): + url = "https://github.com/Exiv2/exiv2/issues/1069" + + filename = "$data_path/Tamron_SP_35mm_f1.4_Di_USD_F045.exv" + commands = ["$exiv2 -pa --grep lensid/i $filename"] + stderr = [""] + stdout = ["" + """Exif.NikonLd3.LensIDNumber Byte 1 Tamron SP 35mm f/1.4 Di USD +""" +] + retval = [0]