diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index b3443819..e00364fb 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -1147,6 +1147,7 @@ namespace Exiv2 { { 368, "Sigma 105mm f/1.4 DG HSM" }, // 8 { 368, "Sigma 14-24mm f/2.8 DG HSM" }, // 9 { 368, "Sigma 70mm f/2.8 DG Macro" }, // 10 + { 368, "Sigma 18-35mm f/1.8 DC HSM | A" }, // 11 { 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM" }, { 489, "Canon EF 70-300mm f/4-5.6L IS USM" }, { 490, "Canon EF 8-15mm f/4L Fisheye USM" }, @@ -1281,6 +1282,7 @@ namespace Exiv2 { { 250, printCsLensByFocalLength }, // not tested { 254, printCsLensByFocalLength }, { 255, printCsLensByFocalLength }, // not tested + { 368, printCsLensByFocalLength }, { 491, printCsLensByFocalLength }, { 493, printCsLensByFocalLength }, // not tested { 624, printCsLensByFocalLengthTC }, diff --git a/test/data/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv b/test/data/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv new file mode 100755 index 00000000..f890c033 Binary files /dev/null and b/test/data/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv differ diff --git a/test/data/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv b/test/data/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv new file mode 100755 index 00000000..e79b13f4 Binary files /dev/null and b/test/data/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv differ diff --git a/tests/bugfixes/github/test_issue_1368.py b/tests/bugfixes/github/test_issue_1368.py new file mode 100644 index 00000000..97a50e6a --- /dev/null +++ b/tests/bugfixes/github/test_issue_1368.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +import system_tests + +class Canon_Sigma_18_35_F18_DC_HSM(metaclass=system_tests.CaseMeta): + url = "https://github.com/Exiv2/exiv2/issues/1368" + + filename1 = "$data_path/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv" + filename2 = "$data_path/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv" + commands = ["$exiv2 -pa -K Exif.CanonCs.LensType $filename1", + "$exiv2 -pa -K Exif.CanonCs.LensType $filename2"] + stderr = ["", ""] + stdout = [ + """Exif.CanonCs.LensType Short 1 Sigma 18-35mm f/1.8 DC HSM | A +""", + """Exif.CanonCs.LensType Short 1 Sigma 18-35mm f/1.8 DC HSM | A +""" +] + retval = [0, 0]