From 23dbf4f51a6a08f2ad7a76ef4af99c10d8a84f3c Mon Sep 17 00:00:00 2001 From: nulllinie Date: Thu, 10 Jun 2021 09:01:38 +0200 Subject: [PATCH] correct identification for Tamron SP 24-70mm G2 A032 (#1691) * correct identification for Tamron SP 24-70mm G2 A032 with LensType 0E (14) Existing entry with LensType 4E is kept as it's needed as well Added testcase for LensType 0E for Tamron_SP_24-70mm_F2.8_Di_VC_USD_G2 --- src/nikonmn_int.cpp | 1 + ...Tamron_SP_24-70mm_F2.8_Di_VC_USD_G2_0E.exv | Bin 0 -> 10848 bytes tests/bugfixes/github/test_pr_1691.py | 20 ++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 test/data/Tamron_SP_24-70mm_F2.8_Di_VC_USD_G2_0E.exv create mode 100644 tests/bugfixes/github/test_pr_1691.py diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 5f21fba7..fd913bed 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2372,6 +2372,7 @@ fmountlens[] = { {0xFE,0x48,0x37,0x5C,0x24,0x24,0xDF,0x0E,0x01,0x00,0x00, "Tamron", "A007", "SP 24-70mm F/2.8 Di VC USD"}, //M "Tamron" "73D" "AF 24-70mm F/3.3-5.6 Aspherical"; {0xCE,0x47,0x37,0x5C,0x25,0x25,0xDF,0x4E,0x00,0x00,0x00, "Tamron", "A032", "SP 24-70mm F/2.8 Di VC USD G2"}, +{0xCE,0x47,0x37,0x5C,0x25,0x25,0xDF,0x0E,0x00,0x00,0x00, "Tamron", "A032", "SP 24-70mm F/2.8 Di VC USD G2"}, {0x45,0x41,0x37,0x72,0x2C,0x3C,0x48,0x02,0x00,0x00,0x00, "Tamron", "190D", "SP AF 24-135mm F/3.5-5.6 AD Aspherical (IF) Macro"}, //M "Tamron" "159D" "AF 28-70mm F/3.5-4.5"; //M "Tamron" "259D" "AF 28-70mm F/3.5-4.5"; diff --git a/test/data/Tamron_SP_24-70mm_F2.8_Di_VC_USD_G2_0E.exv b/test/data/Tamron_SP_24-70mm_F2.8_Di_VC_USD_G2_0E.exv new file mode 100644 index 0000000000000000000000000000000000000000..d3c5b9f52dcd2454ad4646b646105137dafde4ed GIT binary patch literal 10848 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