third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1373 from lbschenkel/sigma_18_35

Browse Source 
Fix_1368 Sigma 18-35mm f/1.8 DC HSM (0.27 only)
This commit is contained in:
Robin Mills 2020-10-19 12:56:11 +01:00 committed by GitHub
commit afb1e83084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/canonmn_int.cpp
View File

@ -918,7 +918,7 @@ namespace Exiv2 {
{ 137, "Tamron SP 60mm f/2 Macro Di II" }, // 12
{ 137, "Sigma 10-20mm f/3.5 EX DC HSM" }, // 13
{ 137, "Tamron SP 24-70mm f/2.8 Di VC USD" }, // 14
{ 137, "Sigma 18-35mm f/1.8 DC HSM" }, // 15
{ 137, "Sigma 18-35mm f/1.8 DC HSM | A" }, // 15
{ 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II" }, // 16
{ 137, "Sigma 70-300mm f/4-5.6 DG OS" }, // 17
{ 138, "Canon EF 28-80mm f/2.8-4L" },
@ -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 },

BIN
test/data/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv Executable file
View File

Binary file not shown.

BIN
test/data/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv Executable file
View File

Binary file not shown.

19
tests/bugfixes/github/test_issue_1368.py Normal file
View File

@ -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]