diff --git a/src/canonmn.cpp b/src/canonmn.cpp index 09522cb9..1aa096ea 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -267,6 +267,9 @@ namespace Exiv2 { { (long int)0x3750000, N_("PowerShot SX60 HS") }, { (long int)0x3760000, N_("PowerShot SX520 HS") }, { (long int)0x3780000, N_("PowerShot G7 X") }, + { (long int)0x3800000, N_("PowerShot SX530 HS") }, + { (long int)0x3820000, N_("PowerShot SX710 HS") }, + { (long int)0x3830000, N_("PowerShot SX610 HS") }, { (long int)0x4040000, N_("PowerShot G1") }, { (long int)0x6040000, N_("PowerShot S100 / Digital IXUS / IXY Digital") }, { (long int)0x4007d673, N_("DC19/DC21/DC22") }, @@ -649,11 +652,14 @@ namespace Exiv2 { { 33, "Carl Zeiss Distagon 15mm T* f/2.8 ZE" }, // 4 { 33, "Carl Zeiss Distagon 18mm T* f/3.5 ZE" }, // 5 { 33, "Carl Zeiss Distagon 21mm T* f/2.8 ZE" }, // 6 - { 33, "Carl Zeiss Distagon 28mm T* f/2 ZE" }, // 7 - { 33, "Carl Zeiss Distagon 35mm T* f/2 ZE" }, // 8 - { 33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE" }, // 9 - { 33, "Carl Zeiss Planar 50mm T* f/1.4 ZE" }, // 10 - { 33, "Carl Zeiss Makro-Planar T* 100mm f/2 ZE" }, // 11 + { 33, "Carl Zeiss Distagon 25mm T* f/2 ZE" }, // 7 + { 33, "Carl Zeiss Distagon 28mm T* f/2 ZE" }, // 8 + { 33, "Carl Zeiss Distagon 35mm T* f/2 ZE" }, // 9 + { 33, "Carl Zeiss Distagon 35mm T* f/1.4 ZE" }, // 10 + { 33, "Carl Zeiss Planar 50mm T* f/1.4 ZE" }, // 11 + { 33, "Carl Zeiss Makro-Planar T* 50mm f/2 ZE" }, // 12 + { 33, "Carl Zeiss Makro-Planar T* 100mm f/2 ZE" }, // 13 + { 33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE" }, // 14 { 35, "Canon EF 35-80mm f/4-5.6" }, { 36, "Canon EF 38-76mm f/4.5-5.6" }, { 37, "Canon EF 35-80mm f/4-5.6" }, // 0 @@ -909,7 +915,7 @@ namespace Exiv2 { { 28, printCsLensByFocalLength }, { 31, printCsLensByFocalLength }, { 32, printCsLensByFocalLength }, - { 33, printCsLensByFocalLength }, // not tested + { 33, printCsLensByFocalLengthAndMaxAperture }, // works partly { 37, printCsLensByFocalLength }, { 42, printCsLensByFocalLength }, { 131, printCsLensByFocalLength }, diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp index bd06063a..f6d1a236 100644 --- a/src/minoltamn.cpp +++ b/src/minoltamn.cpp @@ -1721,7 +1721,9 @@ namespace Exiv2 { "Sigma 18-250mm F3.5-6.3 DC OS HSM | " "Sigma 17-50mm F2.8 EX DC HSM | " "Sigma 17-70mm F2.8-4 DC Macro HSM | " - "Sigma 150mm F2.8 EX DG OS HSM APO Macro" }, + "Sigma 150mm F2.8 EX DG OS HSM APO Macro | " + "Sigma 150-500mm F5-6.3 APO DG OS HSM | " + "Tamron AF 28-105mm F4-5.6 [IF]" }, { 129, "Tamron 200-400mm F5.6 LD | " "Tamron 70-300mm F4-5.6 LD" }, { 131, "Tamron 20-40mm F2.7-3.5 SP Aspherical IF" }, @@ -1753,7 +1755,8 @@ namespace Exiv2 { "Sigma UC AF 28-70mm F3.5-4.5 | " "Sigma AF 28-70mm F2.8 | " "Sigma M-AF 70-200mm F2.8 EX Aspherical | " - "Quantaray M-AF 35-80mm F4-5.6 " }, + "Quantaray M-AF 35-80mm F4-5.6 | " + "Tokina 28-70mm F2.8-4.5 AF" }, { 25520, "Minolta AF 28-85mm F3.5-4.5" }, { 25521, "Minolta AF 28-85mm F3.5-4.5 | " "Tokina 19-35mm F3.5-4.5 | "