diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 3c9e9398..5a8d1239 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/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} }; diff --git a/test/data/exiv2-pr1105.exv b/test/data/exiv2-pr1105.exv new file mode 100644 index 00000000..e7424edd Binary files /dev/null and b/test/data/exiv2-pr1105.exv differ diff --git a/tests/bugfixes/github/test_pr_1105.py b/tests/bugfixes/github/test_pr_1105.py new file mode 100644 index 00000000..16d9024d --- /dev/null +++ b/tests/bugfixes/github/test_pr_1105.py @@ -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]