From 215227024d004d21c990e6831eb3a2cf4e069d41 Mon Sep 17 00:00:00 2001 From: Fredrik Lingvall Date: Fri, 9 Feb 2018 08:50:43 +0100 Subject: [PATCH 1/4] Added Sigma 20mm F1.4 DG HSM | A mount/UPC code (for Nikon mount). --- src/nikonmn_int.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 5a63bcde..142fb416 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2100,7 +2100,7 @@ fmountlens[] = { {0xEA,0x48,0x27,0x27,0x24,0x24,0x1C,0x02,0x00,0x00,0x00, "Sigma", "", "15mm F2.8 EX Diagonal Fisheye"}, //M "Sigma" "410" "18mm F3.5"; {0x26,0x58,0x31,0x31,0x14,0x14,0x1C,0x02,0x00,0x00,0x00, "Sigma", "411442", "20mm F1.8 EX DG Aspherical RF"}, -{0x79,0x54,0x31,0x31,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "20mm F1.4 DG HSM | A"}, +{0x79,0x54,0x31,0x31,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "412555", "20mm F1.4 DG HSM | A"}, {0x26,0x58,0x37,0x37,0x14,0x14,0x1C,0x02,0x00,0x00,0x00, "Sigma", "432447", "24mm F1.8 EX DG Aspherical Macro"}, {0xE1,0x58,0x37,0x37,0x14,0x14,0x1C,0x02,0x00,0x00,0x00, "Sigma", "432447", "24mm F1.8 EX DG Aspherical Macro"}, {0x02,0x46,0x37,0x37,0x25,0x25,0x02,0x00,0x00,0x00,0x00, "Sigma", "438", "24mm F2.8 Super Wide II Macro"}, From 34a3be025e818c57afa45c4ddc45830ab958e179 Mon Sep 17 00:00:00 2001 From: Fredrik lingvall Date: Fri, 9 Feb 2018 08:55:32 +0100 Subject: [PATCH 2/4] Added Sigma 50mm F1.4 DG HSM | A mount/UPC code (for Nikon mount). --- src/nikonmn_int.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 142fb416..4cd78b45 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2109,7 +2109,7 @@ fmountlens[] = { {0xF8,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "477554", "30mm F1.4 EX DC HSM"}, {0x91,0x54,0x44,0x44,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "", "35mm F1.4 DG HSM"}, {0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "310554", "50mm F1.4 EX DG HSM"}, -{0x88,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "50mm F1.4 DG HSM | A"}, +{0x88,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "311551", "50mm F1.4 DG HSM | A"}, {0x02,0x48,0x50,0x50,0x24,0x24,0x02,0x00,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8"}, {0x32,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "346447", "Macro 50mm F2.8 EX DG"}, {0xE3,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8 EX DG"}, From fc8b45dd120d1664c7df34442da29bd1d8229e34 Mon Sep 17 00:00:00 2001 From: Fredrik lingvall Date: Fri, 9 Feb 2018 09:00:42 +0100 Subject: [PATCH 3/4] Added the Sigma 120-300mm F2.8 DG OS HSM | S for Nikon mount. --- src/nikonmn_int.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 4cd78b45..ccc0ea22 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2232,6 +2232,7 @@ fmountlens[] = { {0x48,0x54,0x6F,0x8E,0x24,0x24,0x4B,0x02,0x03,0x00,0x00, "Sigma", "", "APO 120-300mm F2.8 EX DG HSM"}, {0x7A,0x54,0x6E,0x8E,0x24,0x24,0x4B,0x02,0x03,0x00,0x00, "Sigma", "135553", "APO 120-300mm F2.8 EX DG HSM"}, {0xFA,0x54,0x6E,0x8E,0x24,0x24,0x4B,0x02,0x03,0x00,0x00, "Sigma", "135553", "APO 120-300mm F2.8 EX DG HSM"}, +{0x8D,0x48,0x6E,0x8E,0x24,0x24,0x4B,0x0E,0x00,0x00,0x00, "Sigma", "137557", "120-300mm F2.8 DG OS HSM | S"}, {0xCF,0x38,0x6E,0x98,0x34,0x3C,0x4B,0x0E,0x03,0x00,0x00, "Sigma", "728557", "APO 120-400mm F4.5-5.6 DG OS HSM"}, {0x26,0x44,0x73,0x98,0x34,0x3C,0x1C,0x02,0x00,0x00,0x00, "Sigma", "", "135-400mm F4.5-5.6 APO Aspherical"}, {0xCE,0x34,0x76,0xA0,0x38,0x40,0x4B,0x0E,0x03,0x00,0x00, "Sigma", "737559", "APO 150-500mm F5-6.3 DG OS HSM"}, From 73ac02d7f2d10309a2cc1c0a46974386d5f9a774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 20 Feb 2018 23:57:19 +0100 Subject: [PATCH 4/4] Added test for Sigma lenses --- .../Sigma_120-300_DG_OS_HSM_Sport_lens.exv | Bin 0 -> 25148 bytes test/data/Sigma_20mm_F1.4_DG_HSM_A.exv | Bin 0 -> 20417 bytes test/data/Sigma_50mm_F1.4_DG_HSM_A.exv | Bin 0 -> 20419 bytes tests/bugfixes/github/test_issue_227.py | 39 ++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 test/data/Sigma_120-300_DG_OS_HSM_Sport_lens.exv create mode 100644 test/data/Sigma_20mm_F1.4_DG_HSM_A.exv create mode 100644 test/data/Sigma_50mm_F1.4_DG_HSM_A.exv create mode 100644 tests/bugfixes/github/test_issue_227.py diff --git a/test/data/Sigma_120-300_DG_OS_HSM_Sport_lens.exv b/test/data/Sigma_120-300_DG_OS_HSM_Sport_lens.exv new file mode 100644 index 0000000000000000000000000000000000000000..e0070f177b1d7b7916b085b63feb998af4fb2222 GIT binary patch literal 25148 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 PUmo5Na|J}sD? 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 IQ^l$JA7aj!1ONa4 literal 0 HcmV?d00001 diff --git a/tests/bugfixes/github/test_issue_227.py b/tests/bugfixes/github/test_issue_227.py new file mode 100644 index 00000000..b0f756ff --- /dev/null +++ b/tests/bugfixes/github/test_issue_227.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- + +import system_tests + + +class SigmaLenses(system_tests.Case): + + files = [ + "Sigma_120-300_DG_OS_HSM_Sport_lens.exv", + "Sigma_20mm_F1.4_DG_HSM_A.exv", + "Sigma_50mm_F1.4_DG_HSM_A.exv" + ] + + commands = list( + map(lambda fname: "{exiv2} -pa --grep lens/i {data_path}/" + fname, files) + ) + + retval = 3 * [0] + stderr = 3 * [""] + stdout = [ + """Exif.Nikon3.LensType Byte 1 D G VR +Exif.Nikon3.Lens Rational 4 120-300mm F2.8 +Exif.Nikon3.LensFStops Undefined 4 6 +Exif.NikonLd3.LensIDNumber Byte 1 Sigma 120-300mm F2.8 DG OS HSM | S +Exif.NikonLd3.LensFStops Byte 1 F6.0 +""", + """Exif.Nikon3.LensType Byte 1 D G +Exif.Nikon3.Lens Rational 4 20mm F1.4 +Exif.Nikon3.LensFStops Undefined 4 7 +Exif.NikonLd3.LensIDNumber Byte 1 Sigma 20mm F1.4 DG HSM | A +Exif.NikonLd3.LensFStops Byte 1 F7.0 +""", + """Exif.Nikon3.LensType Byte 1 D G +Exif.Nikon3.Lens Rational 4 50mm F1.4 +Exif.Nikon3.LensFStops Undefined 4 7 +Exif.NikonLd3.LensIDNumber Byte 1 Sigma 50mm F1.4 DG HSM | A +Exif.NikonLd3.LensFStops Byte 1 F7.0 +""" + ]