From 5360d82c4a64df8d6af21aa212ebe270e13eceb3 Mon Sep 17 00:00:00 2001 From: Fredrik Strandin Date: Fri, 27 Dec 2019 17:42:35 +0100 Subject: [PATCH] Add ID for Tokina atx-i 11-16mm F2.8 CF (Nikon) Fixes #1078 (cherry picked from commit 2870a1648e86b777afa0ae1540ea4791482d1354) --- src/nikonmn_int.cpp | 2 ++ test/data/Tokina_atx-i_11-16mm_F2.8_CF.exv | Bin 0 -> 19144 bytes tests/bugfixes/github/test_issue_1078.py | 15 +++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 test/data/Tokina_atx-i_11-16mm_F2.8_CF.exv create mode 100644 tests/bugfixes/github/test_issue_1078.py diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 71ff272e..98bf9224 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2538,6 +2538,8 @@ fmountlens[] = { {0xCF,0x47,0x5C,0x8E,0x31,0x3D,0xDF,0x0E,0x00,0x00,0x00, "Tamron", "A030", "SP 70-300mm F/4-5.6 Di VC USD"}, // {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"}, // {0,0,0,0,0,0,0,0,0,0,0, NULL, NULL, NULL} }; diff --git a/test/data/Tokina_atx-i_11-16mm_F2.8_CF.exv b/test/data/Tokina_atx-i_11-16mm_F2.8_CF.exv new file mode 100644 index 0000000000000000000000000000000000000000..8940e14da184d4f6b54131a61b9bc144ccea48c5 GIT binary patch literal 19144 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