Skip to content

Commit 5e4eab0

Browse files
Merge pull request #2248 from Exiv2/hassec_fix_2247
fix naming of canon EF 35-80mm. closes #2247
2 parents 8a9f6ac + 333c436 commit 5e4eab0

11 files changed

+1067
-2
lines changed

src/canonmn_int.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,9 +1474,9 @@ constexpr TagDetails canonCsLensType[] = {{1, "Canon EF 50mm f/1.8"},
14741474
{33, "Carl Zeiss Makro-Planar T* 50mm f/2 ZE"}, // 11
14751475
{33, "Carl Zeiss Makro-Planar T* 100mm f/2 ZE"}, // 12
14761476
{33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE"}, // 13
1477-
{35, "Canon EF 35-80mm f/4-5.6"},
1477+
{35, "Canon EF 35-80mm f/4-5.6 II"},
14781478
{36, "Canon EF 38-76mm f/4.5-5.6"},
1479-
{37, "Canon EF 35-80mm f/4-5.6"},
1479+
{37, "Canon EF 35-80mm f/4-5.6 III"},
14801480
{37, "Tamron 70-200mm f/2.8 Di LD IF Macro"}, // 1
14811481
{37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro"}, // 2
14821482
{37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]"}, // 3

test/data/20220610_MG_7237.exv

36.4 KB
Binary file not shown.

test/data/20220610_MG_7238.exv

36.7 KB
Binary file not shown.

test/data/20220610_MG_7239.exv

36 KB
Binary file not shown.

test/data/20220610_MG_7240.exv

35.4 KB
Binary file not shown.

test/data/20220610_MG_7241.exv

36.2 KB
Binary file not shown.

test/data/test_reference_files/20220610_MG_7237.exv.out

Lines changed: 213 additions & 0 deletions
Large diffs are not rendered by default.

test/data/test_reference_files/20220610_MG_7238.exv.out

Lines changed: 213 additions & 0 deletions
Large diffs are not rendered by default.

test/data/test_reference_files/20220610_MG_7239.exv.out

Lines changed: 213 additions & 0 deletions
Large diffs are not rendered by default.

test/data/test_reference_files/20220610_MG_7240.exv.out

Lines changed: 213 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)