From eeb1e1d5f7fca2ffda7add4c46e24e7cf1828e91 Mon Sep 17 00:00:00 2001 From: Sturmflut Date: Sat, 5 Feb 2022 00:29:38 +0100 Subject: [PATCH 1/2] [nikon] Add Tokina AT-X 14-20 F2 PRO DX lens --- src/nikonmn_int.cpp | 1 + test/data/Tokina_AT-X_14-20_F2_PRO_DX.exv | Bin 0 -> 11824 bytes 2 files changed, 1 insertion(+) create mode 100644 test/data/Tokina_AT-X_14-20_F2_PRO_DX.exv diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index bc46c252..1c8b47b1 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2464,6 +2464,7 @@ fmountlens[] = { {0x00,0x48,0x1C,0x29,0x24,0x24,0x00,0x06,0x00,0x00,0x00, "Tokina", "T4111603", "AT-X 116 PRO DX (AF 11-16mm f/2.8)"}, {0x7A,0x48,0x1C,0x29,0x24,0x24,0x7E,0x06,0x00,0x00,0x00, "Tokina", "", "AT-X 116 PRO DX II (AF 11-16mm f/2.8)"}, {0x7A,0x48,0x1C,0x30,0x24,0x24,0x7E,0x06,0x00,0x00,0x00, "Tokina", "", "AT-X 11-20 F2.8 PRO DX (AF 11-20mm f/2.8)"}, +{0x94,0x54,0x24,0x30,0x18,0x18,0x4a,0x06,0x00,0x00,0x00, "Tokina", "", "AT-X 14-20 F2 PRO DX"}, {0x00,0x3C,0x1F,0x37,0x30,0x30,0x00,0x06,0x00,0x00,0x00, "Tokina", "T4122403", "AT-X 124 AF PRO DX (AF 12-24mm f/4)"}, {0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x01,0x02,0x00, "Tokina", "T4122423", "AT-X 124 AF PRO DX II (AF 12-24mm f/4)"}, {0x7A,0x3C,0x1F,0x3C,0x30,0x30,0x7E,0x06,0x00,0x00,0x00, "Tokina", "", "AT-X 12-28 PRO DX (AF 12-28mm F/4)"}, diff --git a/test/data/Tokina_AT-X_14-20_F2_PRO_DX.exv b/test/data/Tokina_AT-X_14-20_F2_PRO_DX.exv new file mode 100644 index 0000000000000000000000000000000000000000..5f5040433f423c92da3d5982dc545dfbff97b0d9 GIT binary patch literal 11824 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 literal 0 HcmV?d00001 From d53080c820592d3498d1a85cbbdbe371661bf280 Mon Sep 17 00:00:00 2001 From: Sturmflut Date: Tue, 8 Feb 2022 20:46:48 +0100 Subject: [PATCH 2/2] [tests] Add test for Tokina AT-X 14-20 F2 PRO DX lens on Nikon bodies --- tests/bugfixes/github/test_pr_2073.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 tests/bugfixes/github/test_pr_2073.py diff --git a/tests/bugfixes/github/test_pr_2073.py b/tests/bugfixes/github/test_pr_2073.py new file mode 100644 index 00000000..44e70fb5 --- /dev/null +++ b/tests/bugfixes/github/test_pr_2073.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- + +import system_tests + +class NikonTokinaLens_AT_X_14_20_F2_PRO_DX(metaclass=system_tests.CaseMeta): + url = "https://github.com/Exiv2/exiv2/pull/2073" + + filename = "$data_path/Tokina_AT-X_14-20_F2_PRO_DX.exv" + commands = ["$exiv2 -pa --grep lensid/i $filename"] + stderr = [""] + stdout = ["Exif.NikonLd3.LensIDNumber Byte 1 Tokina AT-X 14-20 F2 PRO DX\n"] + retval = [0]