From c49cdd6395ba5e991a7f854eef7078f494cd9b6c Mon Sep 17 00:00:00 2001 From: clanmills Date: Mon, 30 Mar 2020 13:07:09 +0100 Subject: [PATCH 1/2] Code changes. --- src/nikonmn_int.cpp | 2 ++ 1 file changed, 2 insertions(+) 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} }; From e15f8cfdf03381bff1b10d45942f5e9eeaa62464 Mon Sep 17 00:00:00 2001 From: clanmills Date: Mon, 30 Mar 2020 13:07:27 +0100 Subject: [PATCH 2/2] Test changes. --- test/data/exiv2-pr1105.exv | Bin 0 -> 11201 bytes tests/bugfixes/github/test_pr_1105.py | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 test/data/exiv2-pr1105.exv create mode 100644 tests/bugfixes/github/test_pr_1105.py diff --git a/test/data/exiv2-pr1105.exv b/test/data/exiv2-pr1105.exv new file mode 100644 index 0000000000000000000000000000000000000000..e7424edd7ac989fac7bbf55b8d60679d343a8ece GIT binary patch literal 11201 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 S`2Bv18wodAad0;^aPOb~>JC)^ literal 0 HcmV?d00001 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]