From c51573c92edcf126d84479f150a250f91a95a79e Mon Sep 17 00:00:00 2001 From: clanmills Date: Mon, 6 Apr 2020 11:45:16 +0100 Subject: [PATCH] fix_1049_0.27 --- src/nikonmn_int.cpp | 2 +- ...G.exv => Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv} | Bin tests/bugfixes/github/test_pr_992.py | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename test/data/{Sigma_APO_MACRO_180_F3.5_EX_DG.exv => Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv} (100%) diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 5a8d1239..ac2948f3 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2538,7 +2538,7 @@ fmountlens[] = { // 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"}, // -{0xf4,0x4c,0x7c,0x7c,0x2c,0x2c,0x4b,0x02,0x00,0x00,0x00, "Sigma", "", "APO MACRO 180mm F3.5 EX DG"}, +{0xf4,0x4c,0x7c,0x7c,0x2c,0x2c,0x4b,0x02,0x00,0x00,0x00, "Sigma", "", "APO Macro 180mm F3.5 EX DG HSM"}, // 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"}, // https://github.com/Exiv2/exiv2/pull/1105 diff --git a/test/data/Sigma_APO_MACRO_180_F3.5_EX_DG.exv b/test/data/Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv similarity index 100% rename from test/data/Sigma_APO_MACRO_180_F3.5_EX_DG.exv rename to test/data/Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv diff --git a/tests/bugfixes/github/test_pr_992.py b/tests/bugfixes/github/test_pr_992.py index 02230cfe..e18bee87 100644 --- a/tests/bugfixes/github/test_pr_992.py +++ b/tests/bugfixes/github/test_pr_992.py @@ -2,14 +2,14 @@ import system_tests -class NikonSigmaLens_APO_MACRO_180_F35_EX_DG(metaclass=system_tests.CaseMeta): +class NikonSigmaLens_APO_MACRO_180_F35_EX_DG_HSM(metaclass=system_tests.CaseMeta): url = "https://github.com/Exiv2/exiv2/pull/992" - filename = "$data_path/Sigma_APO_MACRO_180_F3.5_EX_DG.exv" + filename = "$data_path/Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv" commands = ["$exiv2 -pa --grep lensid/i $filename"] stderr = [""] stdout = ["" - """Exif.NikonLd3.LensIDNumber Byte 1 Sigma APO MACRO 180mm F3.5 EX DG + """Exif.NikonLd3.LensIDNumber Byte 1 Sigma APO Macro 180mm F3.5 EX DG HSM """ ] retval = [0]