Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD A012' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1' #20

Merged
merged 1 commit into from Sep 21, 2017
Merged

Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD A012' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1' #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/canonmn.cpp
View file
Open in desktop
Expand Up @@ -828,7 +828,8 @@ namespace Exiv2 {
{ 132, "Canon EF 1200mm f/5.6L" },
{ 134, "Canon EF 600mm f/4L IS" },
{ 135, "Canon EF 200mm f/1.8L" },
{ 136, "Canon EF 300mm f/2.8L" },
{ 136, "Canon EF 300mm f/2.8L" }, // 0
{ 136, "Tamron SP 15-30mm f/2.8 Di VC USD A012" }, // 1
{ 137, "Canon EF 85mm f/1.2L" }, // 0
{ 137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM" }, // 1
{ 137, "Sigma 50-200mm f/4-5.6 DC OS HSM" }, // 2
Expand Down Expand Up @@ -1017,7 +1018,10 @@ namespace Exiv2 {
{ 251, "Canon EF 70-200mm f/2.8L IS II USM" },
{ 252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x" },
{ 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x" },
{ 254, "Canon EF 100mm f/2.8L Macro IS USM" },
{ 254, "Canon EF 100mm f/2.8L Macro IS USM" }, // 0
{ 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1" }, // 1
//{ 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 F004" }, // 1 older model
//{ 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 F017" }, // 2 model released in 2016
{ 255, "Sigma 24-105mm f/4 DG OS HSM | A" }, // 0
{ 255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 1
{ 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM" },
Expand Down Expand Up @@ -1092,6 +1096,7 @@ namespace Exiv2 {
{ 42, printCsLensByFocalLength },
{ 47, printCsLensByFocalLength }, // not tested
{ 131, printCsLensByFocalLength },
{ 136, printCsLensByFocalLength },
{ 137, printCsLensByFocalLength }, // not tested
{ 143, printCsLensByFocalLength },
{ 150, printCsLensByFocalLength },
Expand All @@ -1115,6 +1120,7 @@ namespace Exiv2 {
{ 234, printCsLensByFocalLength }, // not tested
{ 248, printCsLensByFocalLength }, // not tested
{ 250, printCsLensByFocalLength }, // not tested
{ 254, printCsLensByFocalLength },
{ 255, printCsLensByFocalLength }, // not tested
{ 493, printCsLensByFocalLength }, // not tested
{ 747, printCsLensByFocalLength }, // not tested
Expand Down