Merge pull request #2248 from Exiv2/hassec_fix_2247

fix naming of canon EF 35-80mm. closes #2247
2022-07-05 10:37:17 +01:00 · 2022-07-05 10:37:17 +01:00 · 5e4eab0012
commit 5e4eab0012
parent 8a9f6ac2b8 333c4365ed
11 changed files with 1067 additions and 2 deletions
--- a/src/canonmn_int.cpp
+++ b/src/canonmn_int.cpp
@ -1474,9 +1474,9 @@ constexpr TagDetails canonCsLensType[] = {{1, "Canon EF 50mm f/1.8"},
                                          {33, "Carl Zeiss Makro-Planar T* 50mm f/2 ZE"},               // 11
                                          {33, "Carl Zeiss Makro-Planar T* 100mm f/2 ZE"},              // 12
                                          {33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE"},                // 13
-                                          {35, "Canon EF 35-80mm f/4-5.6"},
+                                          {35, "Canon EF 35-80mm f/4-5.6 II"},
                                          {36, "Canon EF 38-76mm f/4.5-5.6"},
-                                          {37, "Canon EF 35-80mm f/4-5.6"},
+                                          {37, "Canon EF 35-80mm f/4-5.6 III"},
                                          {37, "Tamron 70-200mm f/2.8 Di LD IF Macro"},                            // 1
                                          {37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro"},  // 2
                                          {37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]"},       // 3
--- a/test/data/20220610_MG_7237.exv
+++ b/test/data/20220610_MG_7237.exv
--- a/test/data/20220610_MG_7238.exv
+++ b/test/data/20220610_MG_7238.exv
--- a/test/data/20220610_MG_7239.exv
+++ b/test/data/20220610_MG_7239.exv
--- a/test/data/20220610_MG_7240.exv
+++ b/test/data/20220610_MG_7240.exv
--- a/test/data/20220610_MG_7241.exv
+++ b/test/data/20220610_MG_7241.exv
--- a/test/data/test_reference_files/20220610_MG_7237.exv.out
+++ b/test/data/test_reference_files/20220610_MG_7237.exv.out
--- a/test/data/test_reference_files/20220610_MG_7238.exv.out
+++ b/test/data/test_reference_files/20220610_MG_7238.exv.out
--- a/test/data/test_reference_files/20220610_MG_7239.exv.out
+++ b/test/data/test_reference_files/20220610_MG_7239.exv.out
--- a/test/data/test_reference_files/20220610_MG_7240.exv.out
+++ b/test/data/test_reference_files/20220610_MG_7240.exv.out
--- a/test/data/test_reference_files/20220610_MG_7241.exv.out
+++ b/test/data/test_reference_files/20220610_MG_7241.exv.out