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

Merge branch '0.27-maintenance' into fix_1091_0.27

Browse Source
This commit is contained in:
Robin Mills
2020-04-06 23:05:39 +01:00
committed by GitHub
parent adf97f997d 18a3cabe46
commit 181cab661b
6 changed files with 1301 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
po/ca.po
+1280 -688
View File
File diff suppressed because it is too large Load Diff
src/nikonmn_int.cpp
+3 -1
View File
@@ -2538,9 +2538,11 @@ 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/issues/1069
{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"},
//
test/data/Sigma_APO_MACRO_180_F3.5_EX_DG.exv → test/data/Sigma_APO_MACRO_180_F3.5_EX_DG_HSM.exv
View File
test/data/Tamron_SP_35mm_f1.4_Di_USD_F045.exv
BIN
View File
Binary file not shown.
tests/bugfixes/github/test_issue_1069.py
+15
View File
@@ -0,0 +1,15 @@
# -*- coding: utf-8 -*-
import system_tests
class NikonTamronLens_F045_35_F14(metaclass=system_tests.CaseMeta):
url = "https://github.com/Exiv2/exiv2/issues/1069"
filename = "$data_path/Tamron_SP_35mm_f1.4_Di_USD_F045.exv"
commands = ["$exiv2 -pa --grep lensid/i $filename"]
stderr = [""]
stdout = [""
"""Exif.NikonLd3.LensIDNumber Byte 1 Tamron SP 35mm f/1.4 Di USD
"""
]
retval = [0]
tests/bugfixes/github/test_pr_992.py
+3 -3
View File
@@ -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]