Merge pull request #891 from sat3ll/tamron70-300.A030.nikon

Add Tamron SP 70-300mm f/4-5.6 Di VC USD (Model: A030) (Nikon Mount)
Exiv2 · May 27, 2019 · 04d770a · 04d770a
2 parents 26dac6a + 1640ac8
commit 04d770a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
@@ -2509,6 +2509,9 @@ fmountlens[] = {
 // https://github.com/Exiv2/exiv2/issues/743
 {0xc9,0x48,0x37,0x5c,0x24,0x24,0x4b,0x4e,0x01,0x00,0x00, "Sigma", "", "24-70mm F2,8 DG OS HSM Art"},
 //
+//  https://github.com/Exiv2/exiv2/issues/598 , https://github.com/Exiv2/exiv2/pull/891
+{0xCF,0x47,0x5C,0x8E,0x31,0x3D,0xDF,0x0E,0x00,0x00,0x00, "Tamron", "A030", "SP 70-300mm F/4-5.6 Di VC USD"},
+//
 {0,0,0,0,0,0,0,0,0,0,0, nullptr, nullptr, nullptr}
 };
 //------------------------------------------------------------------------------

diff --git a/test/data/Tamron_SP70-300_F4-5.6_Di_VC_USD_A030.exv b/test/data/Tamron_SP70-300_F4-5.6_Di_VC_USD_A030.exv
diff --git a/tests/bugfixes/github/test_issue_598.py b/tests/bugfixes/github/test_issue_598.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+import system_tests
+
+class NikonTamronLens_A030_70_300_F4_56(metaclass=system_tests.CaseMeta):
+    url = "https://github.com/Exiv2/exiv2/issues/598"
+
+    filename = "$data_path/Tamron_SP70-300_F4-5.6_Di_VC_USD_A030.exv"
+    commands = ["$exiv2 -pa --grep lensid/i $filename"]
+    stderr = [""]
+    stdout = [""
+        """Exif.NikonLd3.LensIDNumber                   Byte        1  Tamron SP 70-300mm F/4-5.6 Di VC USD
+"""
+]
+    retval = [0]