From e7d113dc42d92b9dc31c714d1679c540ae66d7a4 Mon Sep 17 00:00:00 2001 From: clanmills Date: Mon, 18 May 2020 20:50:36 +0100 Subject: [PATCH] fix_1208_NikonLens_0.27 --- src/nikonmn_int.cpp | 6 +++--- test/data/exiv2-issue1208.exv | Bin 0 -> 11372 bytes tests/bugfixes/github/test_issue_1208.py | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 test/data/exiv2-issue1208.exv create mode 100644 tests/bugfixes/github/test_issue_1208.py diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 05e1acfe..969d748c 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2531,10 +2531,8 @@ fmountlens[] = { {0x00,0x48,0x80,0x80,0x30,0x30,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA313AA", "Nikkor 200mm f/4 AiS"}, {0x00,0x40,0x11,0x11,0x2C,0x2C,0x00,0x00,0x00,0x00,0x00, "Samyang", "", "8mm f/3.5 Fish-Eye"}, {0x00,0x58,0x64,0x64,0x20,0x20,0x00,0x00,0x00,0x00,0x00, "Soligor", "", "C/D Macro MC 90mm f/2.5"}, -// // 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"}, // @@ -2545,7 +2543,9 @@ fmountlens[] = { {0xc8,0x54,0x44,0x44,0x0d,0x0d,0xdf,0x46,0x00,0x00,0x00, "Tamron", "F045", "SP 35mm f/1.4 Di USD"}, // https://github.com/Exiv2/exiv2/pull/1105 {0xCB,0x3C,0x2B,0x44,0x24,0x31,0xDF,0x46,0x00,0x00,0x00, "Tamron", "A037", "17-35mm F/2.8-4 Di OSD"}, -// +// https://github.com/Exiv2/exiv2/issues/1208 +{0xC8,0x54,0x62,0x62,0x0C,0x0C,0x4B,0x46,0x00,0x00,0x00, "Sigma", "321550", "85mm F1.4 DG HSM | A"}, +// Always leave this at the end! {0,0,0,0,0,0,0,0,0,0,0, NULL, NULL, NULL} }; //------------------------------------------------------------------------------ diff --git a/test/data/exiv2-issue1208.exv b/test/data/exiv2-issue1208.exv new file mode 100644 index 0000000000000000000000000000000000000000..183915fbd34588bd13f1e0337046f3da68cbe711 GIT binary patch literal 11372 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 literal 0 HcmV?d00001 diff --git a/tests/bugfixes/github/test_issue_1208.py b/tests/bugfixes/github/test_issue_1208.py new file mode 100644 index 00000000..e69978d2 --- /dev/null +++ b/tests/bugfixes/github/test_issue_1208.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- + +from system_tests import CaseMeta, path + +class Sigma_Art_85mm_F1_4Nikon_F_mount(metaclass=CaseMeta): + + filename = path("$data_path/exiv2-issue1208.exv") + commands = ["$exiv2 -pa --grep lens/i $filename"] + + stdout = ["""Exif.Nikon3.LensType Byte 1 D G +Exif.Nikon3.Lens Rational 4 85mm F1.4 +Exif.Nikon3.LensFStops Undefined 4 7 +Exif.NikonLd3.LensIDNumber Byte 1 Sigma 85mm F1.4 DG HSM | A +Exif.NikonLd3.LensFStops Byte 1 F7.0 +""" + ] + stderr = [""] + retval = [0]