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

add Canon EF 100-400 2x, and make size of aperture lens matching delta dependent on teleconverter factor

Browse Source
This commit is contained in:
Christoph Hasse 2021-07-26 21:53:09 +02:00
parent f4a85d9888
commit e086c7cbd2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/canonmn_int.cpp
View File

@ -2001,6 +2001,7 @@ namespace Exiv2 {
{ 748, "Tamron 100-400mm f/4.5-6.3 Di VC USD + 1.4x" }, // 1
{ 748, "Tamron 70-210mm f/4 Di VC USD + 2x" }, // 2
{ 749, "Tamron 100-400mm f/4.5-6.3 Di VC USD + 2x" },
{ 749, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 2x" }, // 1
{ 750, "Canon EF 35mm f/1.4L II USM" },
{ 750, "Tamron SP 85mm f/1.8 Di VC USD" }, // 1
{ 750, "Tamron SP 45mm f/1.8 Di VC USD" }, // 2
@ -2806,8 +2807,8 @@ namespace Exiv2 {
auto aperMaxTele = std::stof(base_match[4].str()) * tc;
auto aperMaxShort = base_match[3].length() > 0 ? std::stof(base_match[3].str()) * tc : aperMaxTele;
if (flMin != exifFlMin || flMax != exifFlMax || exifAperMax < (aperMaxShort - .1) ||
exifAperMax > (aperMaxTele + .1)) {
if (flMin != exifFlMin || flMax != exifFlMax || exifAperMax < (aperMaxShort - .1 * tc) ||
exifAperMax > (aperMaxTele + .1 * tc)) {
continue;
}

4
tests/lens_tests/utils.py
View File

@ -132,9 +132,9 @@ def lens_is_match(l1, l2):
[
l1["focal_length_min"] * l1["tc"] == l2["focal_length_min"] * l2["tc"],
l1["focal_length_max"] * l1["tc"] == l2["focal_length_max"] * l2["tc"],
(l2["aperture_max_short"] * l2["tc"]) - 0.1
(l2["aperture_max_short"] - 0.1) * l2["tc"]
<= reconstructed_aperture
<= (l2["aperture_max_tele"] * l2["tc"]) + 0.1,
<= (l2["aperture_max_tele"] + 0.1) * l2["tc"],
]
)