From 408351df3c68dce168003ba328acd4540745f863 Mon Sep 17 00:00:00 2001 From: HumanDynamo Date: Wed, 14 Apr 2010 11:15:22 +0000 Subject: [PATCH] by Minolta/Sony lens database update. Not yet completed --- src/minoltasonyvalues.cpp | 134 ++++++++++++++++++++++++-------------- 1 file changed, 85 insertions(+), 49 deletions(-) diff --git a/src/minoltasonyvalues.cpp b/src/minoltasonyvalues.cpp index c2a1b57d..a3fd34d7 100644 --- a/src/minoltasonyvalues.cpp +++ b/src/minoltasonyvalues.cpp @@ -55,49 +55,85 @@ namespace Exiv2 { - No need to i18n these string. */ extern TagDetails const minoltaSonyLensID[] = { - { 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-300mm F4.5-5.6(D) APO | AF100-400mm F4.5-6.7(D)" }, - { 8, "AF70-210mm F4.5-5.6" }, - { 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" }, - { 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 APO Macro" }, - { 24, "AF24-105mm F3.5-4.5(D) | SIGMA 18-50mm F2.8 | Sigma DC 18-125mm F4-5,6 D" }, - { 25, "AF100-300mm F4.5-5.6 APO(D) | SIGMA 30mm F1.4" }, - { 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) | AF50mm F3.5 Macro" }, - { 32, "AF100-400mm F4.5-6.7(D) x1.5 | AF300mm F2.8G APO(D) SSM" }, - { 33, "AF70-200mm F2.8G APO(D) SSM" }, - { 35, "AF85mm F1.4G(D) Limited" }, - { 36, "AF28-100mm F3.5-5.6(D)" }, - { 38, "AF17-35mm F2.8-4(D)" }, - { 39, "AF28-75mm F2.8(D)" }, - { 40, "AFDT18-70mm F3.5-5.6(D)" }, - { 41, "AFDT11-18mm F4.5-5.6(D)" }, - { 42, "AFDT18-200mm F3.5-6.3(D)" }, - { 45, "CZ Planar T* AF85mm F1.4" }, - { 46, "CZ Vario-Sonnar T* AFDT16-80mm F3.5-4.5" }, - { 47, "CZ Sonnar T* 135mm F1.8" }, - { 128, "SIGMA 70-200mm F2.8 APO EX DG MACRO | TAMRON 18-200, 28-300 | 80-300mm F3.5-6.3" }, + { 0, "Minolta AF 28-85mm F3.5-4.5 New" }, + { 1, "Minolta AF 80-200mm F2.8 HS-APO G" }, + { 2, "Minolta AF 28-70mm F2.8 G" }, + { 3, "Minolta AF 28-80mm F4-5.6" }, + { 4, "Minolta AF 85mm F1.4G" }, + { 5, "Minolta AF 35-70mm F3.5-4.5 [II]" }, + { 6, "Minolta AF 24-85mm F3.5-4.5 [New]" }, + { 7, "Minolta AF 100-300mm F4.5-5.6(D) APO [New] | " + "Minolta AF 100-400mm F4.5-6.7(D) | " + "Sigma AF 100-300mm F4 EX DG IF" }, + { 8, "Minolta AF 70-210mm F4.5-5.6 [II]" }, + { 9, "Minolta AF 50mm F3.5 Macro" }, + { 10, "Minolta AF 28-105mm F3.5-4.5 [New]" }, + { 11, "Minolta AF 300mm F4 HS-APO G" }, + { 12, "Minolta AF 100mm F2.8 Soft Focus" }, + { 13, "Minolta AF 75-300mm F4.5-5.6 (New or II)" }, + { 14, "Minolta AF 100-400mm F4.5-6.7 APO" }, + { 15, "Minolta AF 400mm F4.5 HS-APO G" }, + { 16, "Minolta AF 17-35mm F3.5 G" }, + { 17, "Minolta AF 20-35mm F3.5-4.5" }, + { 18, "Minolta AF 28-80mm F3.5-5.6 II" }, + { 19, "Minolta AF 35mm F1.4 G" }, + { 20, "Minolta/Sony 135mm F2.8 [T4.5] STF" }, + { 22, "Minolta AF 35-80mm F4-5.6 II" }, + { 23, "Minolta AF 200mm F4 Macro APO G" }, + { 24, "Minolta/Sony AF 24-105mm F3.5-4.5 (D) | " + "Sigma 18-50mm F2.8 | " + "Sigma 17-70mm F2.8-4.5 (D) | " + "Sigma 20-40mm F2.8 EX DG Aspherical IF | " + "Sigma 18-200mm F3.5-6.3 DC | " + "Sigma 20-40mm F2.8 EX DG Aspherical IF | " + "Sigma DC 18-125mm F4-5,6 D | " + "Tamron SP AF 28-75mm F2.8 XR Di (IF) Macro" }, + { 25, "Minolta AF 100-300mm F4.5-5.6 APO (D) | " + "Sigma 100-300mm F4 EX (APO (D) or D IF) | " + "Sigma 70mm F2.8 EX DG Macro | " + "Sigma 20mm F1.8 EX DG Aspherical RF | " + "Sigma 30mm F1.4 DG EX" }, + { 27, "Minolta AF 85mm F1.4 G (D)" }, + { 28, "Minolta/Sony AF 100mm F2.8 Macro (D) | " + "Tamron SP AF 90mm F2.8 Di Macro" }, + { 29, "Minolta/Sony AF 75-300mm F4.5-5.6 (D) " }, + { 30, "Minolta AF 28-80mm F3.5-5.6 (D) | " + "Sigma AF 10-20mm F4-5.6 EX DC | " + "Sigma AF 12-24mm F4.5-5.6 EX DG | " + "Sigma 28-70mm EX DG F2.8 | " + "Sigma 55-200mm F4-5.6 DC" }, + { 31, "Minolta AF 50mm F2.8 Macro(D) | " + "Minolta AF 50mm F3.5 Macro" }, + { 32, "Minolta AF 100-400mm F4.5-6.7(D) | " + "Minolta AF 300mm F2.8G APO(D) SSM" }, + { 33, "Minolta/Sony AF 70-200mm F2.8 G" }, + { 35, "Minolta AF 85mm F1.4 G (D) Limited" }, + { 36, "Minolta AF 28-100mm F3.5-5.6 (D)" }, + { 38, "Minolta AF 17-35mm F2.8-4 (D)" }, + { 39, "Minolta AF 28-75mm F2.8 (D)" }, + { 40, "Minolta/Sony AF DT 18-70mm F3.5-5.6 (D) | " + "Sony AF DT 18-200mm F3.5-6.3" }, + { 41, "Minolta/Sony AF DT 11-18mm F4.5-5.6 (D) | " + "Tamron SP AF 11-18mm F4.5-5.6 Di II LD Aspherical IF" }, + { 42, "Minolta/Sony AF DT 18-200mm F3.5-6.3 (D)" }, + { 43, "Sony 35mm F1.4 G (SAL-35F14G)" }, + { 44, "Sony 50mm F1.4 (SAL-50F14)" }, + { 45, "Carl Zeiss Planar T* 85mm F1.4 ZA" }, + { 46, "Carl Zeiss Vario-Sonnar T* DT 16-80mm F3.5-4.5 ZA" }, + { 47, "Carl Zeiss Sonnar T* 135mm F1.8 ZA" }, + { 48, "Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL-2470Z)" }, + { 49, "Sony AF DT 55-200mm F4-5.6" }, + { 50, "Sony AF DT 18-250mm F3.5-6.3" }, + { 51, "Sony AF DT 16-105mm F3.5-5.6 | " + "Sony AF DT 55-200mm F4-5.5" }, + { 52, "Sony 70-300mm F4.5-5.6 G SSM" }, + { 53, "Sony AF 70-400mm F4.5-5.6 G SSM (SAL-70400G)" }, + { 54, "Carl Zeiss Vario-Sonnar T* 16-35mm F2.8 ZA SSM (SAL-1635Z)" }, + { 55, "Sony DT 18-55mm F3.5-5.6 SAM (SAL-1855)" }, + { 56, "Sony AF DT 55-200mm F4-5.6 SAM" }, + { 57, "Sony AF DT 50mm F1.8 SAM" }, + { 58, "Sony AF DT 30mm F2.8 SAM Macro" }, + { 128, "Sigma 70-200mm F2.8 APO EX DG MACRO | TAMRON 18-200, 28-300 | 80-300mm F3.5-6.3" }, { 193, "AF 1.4x APO II" }, { 25500, "AF50mm F1.7" }, { 25501, "AF50mm F1.7" }, @@ -110,7 +146,7 @@ namespace Exiv2 { { 25540, "AF35-105mm F3.5-4.5" }, { 25541, "AF35-105mm F3.5-4.5" }, { 25550, "AF70-210mm F4" }, - { 25551, "AF70-210mm F4 Macro | SIGMA 70-210mm F4-5.6 APO" }, + { 25551, "AF70-210mm F4 Macro | Sigma 70-210mm F4-5.6 APO" }, { 25560, "AF135mm F2.8" }, { 25561, "AF135mm F2.8" }, { 25570, "AF28mm F2.8" }, @@ -120,7 +156,7 @@ namespace Exiv2 { { 25600, "AF100-200mm F4.5" }, { 25601, "AF100-200mm F4.5" }, { 25610, "AF75-300mm F4.5-5.6" }, - { 25611, "SIGMA 70-300mm F4-5.6 | SIGMA 300mm F4 APO Macro" }, + { 25611, "Sigma 70-300mm F4-5.6 | Sigma 300mm F4 APO Macro" }, { 25620, "AF50mm F1.4" }, { 25621, "AF50mm F1.4 NEW" }, { 25630, "AF300mm F2.8G APO" }, @@ -129,15 +165,15 @@ namespace Exiv2 { { 25641, "AF50mm F2.8 Macro" }, { 25650, "AF600mm F4 APO" }, { 25660, "AF24mm F2.8" }, - { 25661, "AF24mm F2.8 | SIGMA 17-35mm F2.8-4.0 EX-D" }, + { 25661, "AF24mm F2.8 | Sigma 17-35mm F2.8-4.0 EX-D" }, { 25720, "AF500mm F8 Reflex" }, { 25721, "AF500mm F8 Reflex" }, { 25780, "AF16mm F2.8 Fisheye" }, - { 25781, "AF16mm F2.8 Fisheye | SIGMA 8mm F4 Fisheye" }, + { 25781, "AF16mm F2.8 Fisheye | Sigma 8mm F4 Fisheye" }, { 25790, "AF20mm F2.8" }, { 25791, "AF20mm F2.8" }, { 25810, "AF100mm F2.8 Macro" }, - { 25811, "AF100mm F2.8 Macro(D) | TAMRON 90mm F2.8 Macro | SIGMA 180mm F5.6 Macro" }, + { 25811, "AF100mm F2.8 Macro(D) | TAMRON 90mm F2.8 Macro | Sigma 180mm F5.6 Macro" }, { 25850, "AF35-105mm F3.5-4.5" }, { 25858, "TAMRON 24-135mm F3.5-5.6" }, { 25880, "AF70-210mm F3.5-4.5" }, @@ -159,7 +195,7 @@ namespace Exiv2 { { 26040, "AF80-200mm F4.5-5.6" }, { 26050, "AF35-80mm F4-5.6" }, { 26060, "AF100-300mm F4.5-5.6" }, - { 26061, "AF100-300mm F4.5-5.6(D) | SIGMA 105mm F2.8 Macro EX-DG" }, + { 26061, "AF100-300mm F4.5-5.6(D) | Sigma 105mm F2.8 Macro EX-DG" }, { 26070, "AF35-80mm F4-5.6" }, { 26071, "AF35-80mm F4-5.6" }, { 26080, "AF300mm F2.8G APO High Speed" },