diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp index 5311a235..a5faaa70 100644 --- a/src/minoltamn.cpp +++ b/src/minoltamn.cpp @@ -93,27 +93,39 @@ namespace Exiv2 { }; //! Lookup table to translate Minolta Lens id values to readable labels + /* NOTE: duplicate tags value : 0/25520, 4/25920, 13/25610, 19/25910 22/26050/26070 */ extern const TagDetails minoltaLensID[] = { + { 0, "AF28-85mm F3.5-4.5" }, { 1, "AF80-200mm F2.8G" }, { 2, "AF28-70mm F2.8G" }, + { 3, "AF28-80mm F4-5.6" }, + { 4, "AF85mm F1.4G" }, + { 5, "AF35-70mm F3.5-4.5" }, { 6, "AF24-85mm F3.5-4.5" }, - { 7, "AF100-400mm F4.5-6.7(D)" }, + { 7, "AF100-300mm F4.5-5.6(D) APO or AF100-400mm F4.5-6.7(D)" }, { 8, "AF70-210mm F4.5-5.6" }, - { 11, "AF300mm F4G" }, - { 12, "AF100mm F2.8 Soft" }, - { 15, "AF400mm F4.5G" }, + { 9, "AF50mm F3.5 Macro" }, + { 10, "AF28-105mm F3.5-4.5" }, + { 11, "AF300mm F4G APO" }, + { 12, "AF100mm F2.8 Soft Focus" }, + { 13, "AF75-300mm F4.5-5.6" }, + { 14, "AF100-400mm F4.5-6.7 APO" }, + { 15, "AF400mm F4.5G APO" }, { 16, "AF17-35mm F3.5G" }, - { 19, "AF35mm/1.4" }, + { 17, "AF20-35mm F3.5-4.5" }, + { 18, "AF28-80mm F3.5-5.6" }, + { 19, "AF35mm F1.4G" }, { 20, "STF135mm F2.8[T4.5]" }, + { 22, "AF35-80mm F4-5.6" }, { 23, "AF200mm F4G Macro" }, { 24, "AF24-105mm F3.5-4.5(D) or SIGMA 18-50mm F2.8 or Sigma DC 18-125mm F4-5,6 D" }, - { 25, "AF100-300mm F4.5-5.6(D)" }, - { 27, "AF85mm F1.4G" }, + { 25, "AF100-300mm F4.5-5.6 APO(D)" }, + { 27, "AF85mm F1.4G(D)" }, { 28, "AF100mm F2.8 Macro(D)" }, { 29, "AF75-300mm F4.5-5.6(D)" }, { 30, "AF28-80mm F3.5-5.6(D)" }, { 31, "AF50mm F2.8 Macro(D) or AF50mm F3.5 Macro" }, - { 32, "AF100-400mm F4.5-6.7(D) x1.5" }, + { 32, "AF100-400mm F4.5-6.7(D) x1.5 or AF300mm F2.8G(D) SSM" }, { 33, "AF70-200mm F2.8G SSM" }, { 35, "AF85mm F1.4G(D) Limited" }, { 38, "AF17-35mm F2.8-4(D)" }, @@ -122,10 +134,12 @@ namespace Exiv2 { { 41, "TAMRON Di II LD 11-18mm F4-5.6" }, { 128, "TAMRON 18-200, 28-300 or 80-300mm F3.5-6.3" }, { 25501, "AF50mm F1.7" }, + { 25520, "AF28-85mm F3.5-4.5" }, { 25521, "TOKINA 19-35mm F3.5-4.5 or TOKINA 28-70mm F2.8 AT-X" }, { 25541, "AF35-105mm F3.5-4.5" }, { 25551, "AF70-210mm F4 Macro or SIGMA 70-210mm F4-5.6 APO" }, { 25581, "AF24-50mm F4" }, + { 25610, "AF75-300mm F4.5-5.6" }, { 25611, "SIGMA 70-300mm F4-5.6 or SIGMA 300mm F4 APO Macro" }, { 25621, "AF50mm F1.4 NEW" }, { 25631, "AF300mm F2.8G" }, @@ -137,15 +151,19 @@ namespace Exiv2 { { 25811, "AF100mm F2.8 Macro(D) or TAMRON 90mm F2.8 Macro or SIGMA 180mm F5.6 Macro" }, { 25858, "TAMRON 24-135mm F3.5-5.6" }, { 25891, "TOKINA 80-200mm F2.8" }, + { 25910, "AF35mm F1.4G" }, + { 25920, "AF85mm F1.4G" }, { 25921, "AF85mm F1.4G(D)" }, { 25931, "AF200mm F2.8G" }, { 25961, "AF28mm F2" }, { 25981, "AF100mm F2" }, + { 26050, "AF35-80mm F4-5.6" }, { 26061, "AF100-300mm F4.5-5.6(D) or SIGMA 105mm F2.8 Macro EX-DG" }, + { 26070, "AF35-80mm F4-5.6" }, { 26081, "AF300mm F2.8G" }, { 26121, "AF200mm F2.8G(D)" }, { 26131, "AF50mm F1.7" }, - { 26151, "AF28-105mm F3.5-4.5 Xi" }, + { 26151, "AF28-105mm F3.5-4.5 Xi" }, { 26241, "AF35-80mm F4-5.6" }, { 45741, "AF200mm F2.8G x2 or TOKINA 300mm F2.8 x2" } };