liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update RtExif with data from ExifTool 12.45 (16-09-2022) (#6586)

Browse Source
This commit is contained in:
Thanatomanic 2022-09-27 05:22:22 +02:00 committed by GitHub
parent b575377d5e
commit f4a4ee40b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 129 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
rtexif/canonattribs.cc
View File

@ -633,7 +633,7 @@ public:
{37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro (A20)"},
{37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]"},
{37, "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro"},
{38, "Canon EF 80-200mm f/4.5-5.6"},
{38, "Canon EF 80-200mm f/4.5-5.6 II"},
{39, "Canon EF 75-300mm f/4-5.6"},
{40, "Canon EF 28-80mm f/3.5-5.6"},
{41, "Canon EF 28-90mm f/4-5.6"},
@ -654,6 +654,7 @@ public:
{53, "Canon EF-S 18-55mm f/3.5-5.6 III"},
{54, "Canon EF-S 55-250mm f/4-5.6 IS II"},
{60, "Irix 11mm f/4"},
{63, "Irix 30mm F1.4 Dragonfly"},
{80, "Canon TS-E 50mm f/2.8L Macro"},
{81, "Canon TS-E 90mm f/2.8L Macro"},
{82, "Canon TS-E 135mm f/4L Macro"},
@ -916,12 +917,13 @@ public:
{252, "Canon EF 70-200mm f/2.8L IS III USM + 1.4x"},
{253, "Canon EF 70-200mm f/2.8L IS II USM + 2x"},
{253, "Canon EF 70-200mm f/2.8L IS III USM + 2x"},
{254, "Canon EF 100mm f/2.8L Macro IS USM"},
{254, "Canon EF 100mm f/2.8L Macro IS USM or Tamron Lens"},
{254, "Tamron SP 90mm f/2.8 Di VC USD 1:1 Macro (F017)"},
{255, "Sigma 24-105mm f/4 DG OS HSM | A or Other Lens"},
{255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"},
{255, "Tamron SP 70-200mm f/2.8 Di VC USD"},
{368, "Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens"},
{368, "Sigma 35mm f/1.4 DG HSM | A"},
{368, "Sigma 20mm f/1.4 DG HSM | A"},
{368, "Sigma 50mm f/1.4 DG HSM | A"},
{368, "Sigma 40mm f/1.4 DG HSM | A"},
{368, "Sigma 60-600mm f/4.5-6.3 DG OS HSM | S"},
@ -930,7 +932,9 @@ public:
{368, "Sigma 85mm f/1.4 DG HSM | A"},
{368, "Sigma 105mm f/1.4 DG HSM"},
{368, "Sigma 14-24mm f/2.8 DG HSM"},
{368, "Sigma 35mm f/1.4 DG HSM | A"},
{368, "Sigma 70mm f/2.8 DG Macro"},
{368, "Sigma 18-35mm f/1.8 DC HSM | A"},
{488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM"},
{489, "Canon EF 70-300mm f/4-5.6L IS USM"},
{490, "Canon EF 8-15mm f/4L Fisheye USM"},
@ -958,7 +962,8 @@ public:
{507, "Canon EF 16-35mm f/4L IS USM"},
{508, "Canon EF 11-24mm f/4L USM or Tamron Lens"},
{508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD (B023)"},
{624, "Sigma 70-200mm f/2.8 DG OS HSM | S"},
{624, "Sigma 70-200mm f/2.8 DG OS HSM | S or other Sigma Lens"},
{624, "Sigma 150-600mm f/5-6.3 | C"},
{747, "Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens"},
{747, "Tamron SP 150-600mm f/5-6.3 Di VC USD G2"},
{748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x or Tamron Lens"},
@ -994,7 +999,8 @@ public:
{4158, "Canon EF-S 18-55mm f/4-5.6 IS STM"},
{4159, "Canon EF-M 32mm f/1.4 STM"},
{4160, "Canon EF-S 35mm f/2.8 Macro IS STM"},
{4208, "Sigma 56mm f/1.4 DC DN | C"},
{4208, "Sigma 56mm f/1.4 DC DN | C or other Sigma Lens"},
{4208, "Sigma 30mm F1.4 DC DN | C"},
{36910, "Canon EF 70-300mm f/4-5.6 IS II USM"},
{36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM"},
{61182, "Canon RF 35mm F1.8 Macro IS STM or other Canon RF Lens"},
@ -1002,9 +1008,41 @@ public:
{61182, "Canon RF 24-105mm F4 L IS USM"},
{61182, "Canon RF 28-70mm F2 L USM"},
{61182, "Canon RF 85mm F1.2L USM"},
{61182, "Canon RF 85mm F1.2L USM DS"},
{61182, "Canon RF 24-70mm F2.8L IS USM"},
{61182, "Canon RF 15-35mm F2.8L IS USM"},
{61182, "Canon RF 24-240mm F4-6.3 IS USM"},
{61182, "Canon RF 24-70mm F2.8 L IS USM"},
{61182, "Canon RF 15-35mm F2.8 L IS USM"},
{61182, "Canon RF 70-200mm F2.8L IS USM"},
{61182, "Canon RF 85mm F2 MACRO IS STM"},
{61182, "Canon RF 600mm F11 IS STM"},
{61182, "Canon RF 600mm F11 IS STM + RF1.4x"},
{61182, "Canon RF 600mm F11 IS STM + RF2x"},
{61182, "Canon RF 800mm F11 IS STM"},
{61182, "Canon RF 800mm F11 IS STM + RF1.4x"},
{61182, "Canon RF 800mm F11 IS STM + RF2x"},
{61182, "Canon RF 24-105mm F4-7.1 IS STM"},
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM"},
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x"},
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM + RF2x"},
{61182, "Canon RF 70-200mm F4L IS USM"},
{61182, "Canon RF 100mm F2.8L MACRO IS USM"},
{61182, "Canon RF 50mm F1.8 STM"},
{61182, "Canon RF 14-35mm F4L IS USM"},
{61182, "Canon RF-S 18-45mm F4.5-6.3 IS STM"},
{61182, "Canon RF 100-400mm F5.6-8 IS USM"},
{61182, "Canon RF 100-400mm F5.6-8 IS USM + RF1.4x"},
{61182, "Canon RF 100-400mm F5.6-8 IS USM + RF2x"},
{61182, "Canon RF-S 18-150mm F3.5-6.3 IS STM"},
{61182, "Canon RF 24mm F1.8 MACRO IS STM"},
{61182, "Canon RF 16mm F2.8 STM"},
{61182, "Canon RF 400mm F2.8L IS USM"},
{61182, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
{61182, "Canon RF 400mm F2.8L IS USM + RF2x"},
{61182, "Canon RF 600mm F4L IS USM"},
{61182, "Canon RF 15-30mm F4.5-6.3 IS STM"},
{61182, "Canon RF 800mm F5.6L IS USM"},
{61182, "Canon RF 1200mm F8L IS USM"},
{61182, "Canon RF 5.2mm F2.8L Dual Fisheye 3D VR"},
{61491, "Canon CN-E 14mm T3.1 L F"},
{61492, "Canon CN-E 24mm T1.5 L F"},
{61494, "Canon CN-E 85mm T1.3 L F"},
@ -1898,6 +1936,7 @@ public:
choices[2147484678] = "EOS 6D Mark II";
choices[2147484680] = "EOS 77D / 9000D";
choices[2147484695] = "EOS Rebel SL2 / 200D / Kiss X9";
choices[2147484705] = "EOS R5";
choices[2147484706] = "EOS Rebel T100 / 4000D / 3000D";
choices[2147484708] = "EOS R";
choices[2147484712] = "EOS-1D X Mark III";
@ -1906,6 +1945,12 @@ public:
choices[2147484725] = "EOS Rebel T8i / 850D / X10i";
choices[2147484726] = "EOS SL3 / 250D / Kiss X10";
choices[2147484727] = "EOS 90D";
choices[2147484752] = "EOS R3";
choices[2147484755] = "EOS R6";
choices[2147484772] = "EOS R7";
choices[2147484773] = "EOS R10";
choices[2147484775] = "PowerShot ZOOM";
choices[2147484776] = "EOS M50 Mark II / Kiss M2";
choices[2147484960] = "EOS D2000C";
choices[2147485024] = "EOS D6000C";
}

18
rtexif/nikonattribs.cc
View File

@ -611,6 +611,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"02 3A 37 50 31 3D 02 00", "Sigma 24-50mm f/4-5.6 UC"},
{"02 3A 5E 8E 32 3D 02 00", "Sigma 75-300mm f/4.0-5.6"},
{"02 3B 44 61 30 3D 02 00", "Sigma 35-80mm f/4-5.6"},
{"02 3B 5C 82 30 3C 02 00", "Sigma Zoom-K 70-210mm f/4-5.6"},
{"02 3C B0 B0 3C 3C 02 00", "Sigma APO 800mm f/5.6"},
{"02 3F 24 24 2C 2C 02 00", "Sigma 14mm f/3.5"},
{"02 3F 3C 5C 2D 35 02 00", "Sigma 28-70mm f/3.5-4.5 UC"},
@ -635,6 +636,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"07 3E 30 43 2D 35 03 00", "Soligor AF Zoom 19-35mm 1:3.5-4.5 MC"},
{"07 40 2F 44 2C 34 03 02", "Tamron AF 19-35mm f/3.5-4.5 (A10)"},
{"07 40 30 45 2D 35 03 02", "Tamron AF 19-35mm f/3.5-4.5 (A10)"},
{"07 40 30 45 2D 35 03 02", "Voigtlander Ultragon 19-35mm f/3.5-4.5 VMV"},
{"07 40 3C 5C 2C 35 03 00", "Tokina AF 270 II (AF 28-70mm f/3.5-4.5)"},
{"07 40 3C 62 2C 34 03 00", "AF Zoom-Nikkor 28-85mm f/3.5-4.5"},
{"07 46 2B 44 24 30 03 02", "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical (IF) (A05)"},
@ -719,6 +721,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"26 40 7B A0 34 40 1C 02", "Sigma APO 170-500mm f/5-6.3 Aspherical RF"},
{"26 41 3C 8E 2C 40 1C 02", "Sigma 28-300mm f/3.5-6.3 DG Macro"},
{"26 44 73 98 34 3C 1C 02", "Sigma 135-400mm f/4.5-5.6 APO Aspherical"},
{"26 45 68 8E 34 42 1C 02", "Sigma 100-300mm f/4.5-6.7 DL"},
{"26 48 11 11 30 30 1C 02", "Sigma 8mm f/4 EX Circular Fisheye"},
{"26 48 27 27 24 24 1C 02", "Sigma 15mm f/2.8 EX Diagonal Fisheye"},
{"26 48 2D 50 24 24 1C 06", "Sigma 18-50mm f/2.8 EX DC"},
@ -874,6 +877,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"6E 48 98 98 24 24 74 02", "AF-S Nikkor 400mm f/2.8D IF-ED II"},
{"6F 3C A0 A0 30 30 75 02", "AF-S Nikkor 500mm f/4D IF-ED II"},
{"70 3C A6 A6 30 30 76 02", "AF-S Nikkor 600mm f/4D IF-ED II"},
{"71 48 64 64 24 24 00 00", "Voigtlander APO-Skopar 90mm f/2.8 SL IIs"},
{"72 48 4C 4C 24 24 77 00", "Nikkor 45mm f/2.8 P"},
{"74 40 37 62 2C 34 78 06", "AF-S Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
{"75 40 3C 68 2C 3C 79 06", "AF Zoom-Nikkor 28-100mm f/3.5-5.6G"},
@ -901,6 +905,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"7A 48 2D 50 24 24 4B 06", "Sigma 18-50mm f/2.8 EX DC Macro"},
{"7A 48 5C 80 24 24 4B 06", "Sigma 70-200mm f/2.8 EX APO DG Macro HSM II"},
{"7A 54 6E 8E 24 24 4B 02", "Sigma APO 120-300mm f/2.8 EX DG HSM"},
{"7B 48 37 44 18 18 4B 06", "Sigma 24-35mm f/2.0 DG HSM | A"},
{"7B 48 80 98 30 30 80 0E", "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED"},
{"7C 54 2B 50 24 24 00 06", "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF) (A16)"},
{"7D 48 2B 53 24 24 82 06", "AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED"},
@ -914,6 +919,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"82 34 76 A6 38 40 4B 0E", "Sigma 150-600mm f/5-6.3 DG OS HSM | C"},
{"82 48 8E 8E 24 24 87 0E", "AF-S VR Nikkor 300mm f/2.8G IF-ED"},
{"83 00 B0 B0 5A 5A 88 04", "FSA-L2, EDG 65, 800mm f/13 G"},
{"87 2C 2D 8E 2C 40 4B 0E", "Sigma 18-300mm f/3.5-6.3 DC Macro HSM"},
{"88 54 50 50 0C 0C 4B 06", "Sigma 50mm f/1.4 DG HSM | A"},
{"89 30 2D 80 2C 40 4B 0E", "Sigma 18-200mm f/3.5-6.3 DC Macro OS HS | C"},
{"89 3C 53 80 30 3C 8B 06", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"},
@ -921,8 +927,10 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"8A 54 6A 6A 24 24 8C 0E", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"},
{"8B 40 2D 80 2C 3C 8D 0E", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
{"8B 40 2D 80 2C 3C FD 0E", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED [II]"},
{"8B 48 1C 30 24 24 85 06", "Tokina AT-X 11-20 f/2.8 PRO DX (AF 11-20mm f/2.8)"},
{"8B 4C 2D 44 14 14 4B 06", "Sigma 18-35mm f/1.8 DC HSM"},
{"8C 40 2D 53 2C 3C 8E 06", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED"},
{"8C 48 29 3C 24 24 86 06", "Tokina opera 16-28mm f/2.8 FF"},
{"8D 44 5C 8E 34 3C 8F 0E", "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED"},
{"8D 48 6E 8E 24 24 4B 0E", "Sigma 120-300mm f/2.8 DG OS HSM Sports"},
{"8E 3C 2B 5C 24 30 4B 0E", "Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C"},
@ -960,13 +968,17 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"9E 40 2D 6A 2C 3C A0 0E", "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED"},
{"9F 37 50 A0 34 40 4B 0E", "Sigma 50-500mm f/4.5-6.3 DG OS HSM"},
{"9F 48 48 48 24 24 A1 06", "Yongnuo YN40mm f/2.8N"},
{"9F 54 68 68 18 18 A2 06", "Yongnuo YN100mm f/2N"},
{"9F 58 44 44 14 14 A1 06", "AF-S DX Nikkor 35mm f/1.8G"},
{"A0 37 5C 8E 34 3C A2 06", "Sony FE 70-300mm f/4.5-5.6 G OSS"},
{"A0 40 2D 53 2C 3C CA 0E", "AF-P DX Nikkor 18-55mm f/3.5-5.6G VR"},
{"A0 40 2D 53 2C 3C CA 8E", "AF-P DX Nikkor 18-55mm f/3.5-5.6G"},
{"A0 40 2D 74 2C 3C BB 0E", "AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR"},
{"A0 48 2A 5C 24 30 4B 0E", "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"},
{"A0 54 50 50 0C 0C A2 06", "AF-S Nikkor 50mm f/1.4G"},
{"A0 56 44 44 14 14 A2 06", "Sony FE 35mm f/1.8"},
{"A1 40 18 37 2C 34 A3 06", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"},
{"A1 40 2D 53 2C 3C CB 86", "AF-P DX Nikkor 18-55mm f/3.5-5.6G"},
{"A1 41 19 31 2C 2C 4B 06", "Sigma 10-20mm f/3.5 EX DC HSM"},
{"A1 48 6E 8E 24 24 DB 4E", "AF-S Nikkor 120-300mm f/2.8E FL ED SR VR"},
{"A1 54 55 55 0C 0C BC 06", "AF-S Nikkor 58mm f/1.4G"},
@ -1040,6 +1052,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"B6 48 37 56 24 24 1C 02", "Sigma 24-60mm f/2.8 EX DG"},
{"B7 44 60 98 34 3C B9 0E", "AF-S Nikkor 80-400mm f/4.5-5.6G ED VR"},
{"B8 40 2D 44 2C 34 BA 06", "AF-S Nikkor 18-35mm f/3.5-4.5G ED"},
{"BB 48 5C 80 24 24 4B 4E", "Sigma 70-200mm f/2.8 DG OS HSM | S"},
{"BF 3C 1B 1B 30 30 01 04", "Irix 11mm f/4 Firefly"},
{"BF 4E 26 26 1E 1E 01 04", "Irix 15mm f/2.4 Firefly"},
{"C1 48 24 37 24 24 4B 46", "Sigma 14-24mm f/2.8 DG HSM | A"},
@ -1051,8 +1064,10 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"C8 54 62 62 0C 0C 4B 46", "Sigma 85mm f/1.4 DG HSM | A"},
{"C9 3C 44 76 25 31 DF 4E", "Tamron 35-150mm f/2.8-4 Di VC OSD (A043)"},
{"C9 48 37 5C 24 24 4B 4E", "Sigma 24-70mm f/2.8 DG OS HSM | A"},
{"CA 3C 1F 37 30 30 4B 46", "Sigma 12-24mm f/4 DG HSM | A"},
{"CA 48 27 3E 24 24 DF 4E", "Tamron SP 15-30mm f/2.8 Di VC USD G2 (A041)"},
{"CB 3C 2B 44 24 31 DF 46", "Tamron 17-35mm f/2.8-4 Di OSD (A037)"},
{"CC 44 68 98 34 41 DF 0E", "Tamron 100-400mm f/4.5-6.3 Di VC USD"},
{"CC 4C 50 68 14 14 4B 06", "Sigma 50-100mm f/1.8 DC HSM | A"},
{"CD 3D 2D 70 2E 3C 4B 0E", "Sigma 18-125mm f/3.8-5.6 DC OS HSM"},
{"CE 34 76 A0 38 40 4B 0E", "Sigma 150-500mm f/5-6.3 DG OS APO HSM"},
@ -1060,6 +1075,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"CF 38 6E 98 34 3C 4B 0E", "Sigma APO 120-400mm f/4.5-5.6 DG OS HSM"},
{"CF 47 5C 8E 31 3D DF 0E", "Tamron SP 70-300mm f/4-5.6 Di VC USD (A030)"},
{"D2 3C 8E B0 3C 3C 4B 02", "Sigma APO 300-800mm f/5.6 EX DG HSM"},
{"DB 40 11 11 2C 2C 1C 06", "Sigma 8mm f/3.5 EX DG Circular Fisheye"},
{"DC 48 19 19 24 24 4B 06", "Sigma 10mm f/2.8 EX DC HSM Fisheye"},
{"DE 54 50 50 0C 0C 4B 06", "Sigma 50mm f/1.4 EX DG HSM"},
{"E0 3C 5C 8E 30 3C 4B 06", "Sigma 70-300mm f/4-5.6 APO DG Macro HSM"},
@ -1067,6 +1083,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"E1 40 19 36 2C 35 DF 4E", "Tamron 10-24mm f/3.5-4.5 Di II VC HLD (B023)"},
{"E1 58 37 37 14 14 1C 02", "Sigma 24mm f/1.8 EX DG Aspherical Macro"},
{"E2 47 5C 80 24 24 DF 4E", "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)"},
{"E3 40 76 A6 38 40 DF 0E", "Tamron SP 150-600mm f/5-6.3 Di VC USD G2 (A022)"},
{"E3 40 76 A6 38 40 DF 4E", "Tamron SP 150-600mm f/5-6.3 Di VC USD G2"},
{"E3 54 50 50 24 24 35 02", "Sigma Macro 50mm f/2.8 EX DG"},
{"E4 54 64 64 24 24 DF 0E", "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 (F017)"},
@ -1081,6 +1098,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"EA 40 29 8E 2C 40 DF 0E", "Tamron 16-300mm f/3.5-6.3 Di II VC PZD (B016)"},
{"EA 48 27 27 24 24 1C 02", "Sigma 15mm f/2.8 EX Diagonal Fisheye"},
{"EB 40 76 A6 38 40 DF 0E", "Tamron SP AF 150-600mm f/5-6.3 VC USD (A011)"},
{"EC 3E 3C 8E 2C 40 DF 0E", "Tamron 28-300mm f/3.5-6.3 Di VC PZD A010"},
{"ED 40 2D 80 2C 40 4B 0E", "Sigma 18-200mm f/3.5-6.3 DC OS HSM"},
{"EE 48 5C 80 24 24 4B 06", "Sigma 70-200mm f/2.8 EX APO DG Macro HSM II"},
{"F0 38 1F 37 34 3C 4B 06", "Sigma 12-24mm f/4.5-5.6 EX DG Aspherical HSM"},

4
rtexif/olympusattribs.cc
View File

@ -130,9 +130,12 @@ public:
lenses["00 32 00"] = "Olympus Zuiko Digital ED 14-35mm f/2.0 SWD";
lenses["00 32 10"] = "Olympus M.Zuiko Digital ED 12-200mm f/3.5-6.3";
lenses["00 33 00"] = "Olympus Zuiko Digital 25mm f/2.8";
lenses["00 33 10"] = "Olympus M.Zuiko Digital 150-400mm f/4.5 TC1.25x IS Pro";
lenses["00 34 00"] = "Olympus Zuiko Digital ED 9-18mm f/4.0-5.6";
lenses["00 34 10"] = "Olympus M.Zuiko Digital ED 12-45mm f/4.0 Pro";
lenses["00 35 00"] = "Olympus Zuiko Digital 14-54mm f/2.8-3.5 II";
lenses["00 35 10"] = "Olympus M.Zuiko 100-400mm f/5.0-6.3";
lenses["00 36 10"] = "Olympus M.Zuiko Digital ED 8-25mm f/4 Pro";
lenses["01 01 00"] = "Sigma 18-50mm f/3.5-5.6 DC";
lenses["01 01 10"] = "Sigma 30mm f/2.8 EX DN";
lenses["01 02 00"] = "Sigma 55-200mm f/4.0-5.6 DC";
@ -200,6 +203,7 @@ public:
lenses["02 36 10"] = "Leica DG Elmarit 200mm f/2.8 Power OIS";
lenses["02 37 10"] = "Leica DG Vario-Elmarit 50-200mm f/2.8-4 Asph. Power OIS";
lenses["02 38 10"] = "Leica DG Vario-Summilux 10-25mm f/1.7 Asph.";
lenses["02 40 10"] = "Leica DG Vario-Summilux 25-50mm f/1.7 Asph.";
lenses["03 01 00"] = "Leica D Vario Elmarit 14-50mm f/2.8-3.5 Asph.";
lenses["03 02 00"] = "Leica D Summilux 25mm f/1.4 Asph.";
lenses["05 01 10"] = "Tamron 14-150mm f/3.5-5.8 Di III";

4
rtexif/pentaxattribs.cc
View File

@ -924,6 +924,7 @@ public:
choices.insert (p_t (256 * 8 + 21, "Sigma 17-50mm f/2.8 EX DC OS HSM"));
choices.insert (p_t (256 * 8 + 22, "Sigma 85mm f/1.4 EX DG HSM"));
choices.insert (p_t (256 * 8 + 23, "Sigma 70-200mm f/2.8 APO EX DG OS HSM"));
choices.insert (p_t (256 * 8 + 24, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"));
choices.insert (p_t (256 * 8 + 25, "Sigma 17-50mm f/2.8 EX DC HSM"));
choices.insert (p_t (256 * 8 + 27, "Sigma 18-200mm f/3.5-6.3 II DC HSM"));
choices.insert (p_t (256 * 8 + 28, "Sigma 18-250mm f/3.5-6.3 DC Macro HSM"));
@ -940,6 +941,9 @@ public:
choices.insert (p_t (256 * 8 + 63, "HD PENTAX-D FA 15-30mm f/2.8 ED SDM WR"));
choices.insert (p_t (256 * 8 + 64, "HD PENTAX-D FA* 50mm f/1.4 SDM AW"));
choices.insert (p_t (256 * 8 + 65, "HD PENTAX-D FA 70-210mm f/4 ED SDM WR"));
choices.insert (p_t (256 * 8 + 66, "HD PENTAX-D FA 85mm f/1.4 ED SDM AW"));
choices.insert (p_t (256 * 8 + 67, "HD PENTAX-D FA 21mm f/2.4 ED Limited DC WR"));
choices.insert (p_t (256 * 8 + 195, "HD PENTAX DA* 16-50mm f/2.8 ED PLM AW"));
choices.insert (p_t (256 * 8 + 196, "HD PENTAX-DA* 11-18mm f/2.8 ED DC AW"));
choices.insert (p_t (256 * 8 + 197, "HD PENTAX-DA 55-300mm f/4.5-6.3 ED PLM WR RE"));
choices.insert (p_t (256 * 8 + 198, "smc PENTAX-DA L 18-50mm f/4-5.6 DC WR RE"));

53
rtexif/sonyminoltaattribs.cc
View File

@ -1035,11 +1035,13 @@ public:
choices.insert (p_t (2, "Sony LA-EA2 Adapter"));
choices.insert (p_t (3, "Sony LA-EA3 Adapter"));
choices.insert (p_t (6, "Sony LA-EA4 Adapter"));
choices.insert (p_t (7, "Sony LA-EA5 Adapter"));
choices.insert (p_t (44, "Metabones Canon EF Smart Adapter"));
choices.insert (p_t (78, "Metabones Canon EF Smart Adapter Mark III or Other Adapter"));
choices.insert (p_t (184, "Metabones Canon EF Speed Booster Ultra"));
choices.insert (p_t (234, "Metabones Canon EF Smart Adapter Mark IV"));
choices.insert (p_t (239, "Metabones Canon EF Speed Booster"));
choices.insert (p_t (24593, "LA-EA4r MonsterAdapter"));
choices.insert (p_t (32784, "Sony E 16mm f/2.8"));
choices.insert (p_t (32785, "Sony E 18-55mm f/3.5-5.6 OSS"));
choices.insert (p_t (32786, "Sony E 55-210mm f/4.5-6.3 OSS"));
@ -1097,8 +1099,23 @@ public:
choices.insert (p_t (32852, "Sony FE 600mm f/4 GM OSS"));
choices.insert (p_t (32853, "Sony E 16-55mm f/2.8 G"));
choices.insert (p_t (32854, "Sony E 70-350mm f/4.5-6.3 G OSS"));
choices.insert (p_t (32855, "Sony FE C 16-35mm T3.1 G"));
choices.insert (p_t (32858, "Sony FE 35mm f/1.8"));
choices.insert (p_t (32859, "Sony FE 20mm f/1.8 G"));
choices.insert (p_t (32860, "Sony FE 12-24mm f/2.8 GM"));
choices.insert (p_t (32862, "Sony FE 50mm f/1.2 GM"));
choices.insert (p_t (32863, "Sony FE 14mm f/1.8 GM"));
choices.insert (p_t (32864, "Sony FE 28-60mm f/4-5.6"));
choices.insert (p_t (32865, "Sony FE 35mm f/1.4 GM"));
choices.insert (p_t (32866, "Sony FE 24mm f/2.8 G"));
choices.insert (p_t (32867, "Sony FE 40mm f/2.5 G"));
choices.insert (p_t (32868, "Sony FE 50mm f/2.5 G"));
choices.insert (p_t (32871, "Sony FE PZ 16-35mm f/4 G"));
choices.insert (p_t (32873, "Sony E PZ 10-20mm f/4 G"));
choices.insert (p_t (32874, "Sony FE 70-200mm f/2.8 GM OSS II"));
choices.insert (p_t (32875, "Sony FE 24-70mm f/2.8 GM II"));
choices.insert (p_t (32876, "Sony E 11mm f/1.8"));
choices.insert (p_t (32877, "Sony E 15mm f/1.4 G"));
choices.insert (p_t (33072, "Sony FE 70-200mm f/2.8 GM OSS + 1.4X Teleconverter"));
choices.insert (p_t (33073, "Sony FE 70-200mm f/2.8 GM OSS + 2X Teleconverter"));
choices.insert (p_t (33076, "Sony FE 100mm f/2.8 STF GM OSS (macro mode)"));
@ -1130,6 +1147,17 @@ public:
choices.insert (p_t (49461, "Tamron 20mm f/2.8 Di III OSD M1:2"));
choices.insert (p_t (49462, "Tamron 70-180mm f/2.8 Di III VXD"));
choices.insert (p_t (49463, "Tamron 28-200mm f/2.8-5.6 Di III RXD"));
choices.insert (p_t (49464, "Tamron 70-300mm f/4.5-6.3 Di III RXD"));
choices.insert (p_t (49465, "Tamron 17-70mm f/2.8 Di III-A VC RXD"));
choices.insert (p_t (49466, "Tamron 150-500mm f/5-6.7 Di III VC VXD"));
choices.insert (p_t (49467, "Tamron 11-20mm f/2.8 Di III-A RXD"));
choices.insert (p_t (49468, "Tamron 18-300mm f/3.5-6.3 Di III-A VC VXD"));
choices.insert (p_t (49469, "Tamron 35-150mm f/2-F2.8 Di III VXD"));
choices.insert (p_t (49470, "Tamron 28-75mm f/2.8 Di III VXD G2"));
choices.insert (p_t (49471, "Tamron 50-400mm f/4.5-6.3 Di III VC VXD"));
choices.insert (p_t (49473, "Tokina atx-m 85mm f/1.8 FE or Viltrox lens"));
choices.insert (p_t (49473, "Viltrox 23mm f/1.4 E"));
choices.insert (p_t (49473, "Viltrox 56mm f/1.4 E"));
choices.insert (p_t (49712, "Tokina FiRIN 20mm f/2 FE AF"));
choices.insert (p_t (49713, "Tokina FiRIN 100mm f/2.8 FE MACRO"));
choices.insert (p_t (50480, "Sigma 30mm f/1.4 DC DN | C"));
@ -1157,7 +1185,20 @@ public:
choices.insert (p_t (50515, "Sigma 35mm f/1.2 DG DN | A"));
choices.insert (p_t (50516, "Sigma 14-24mm f/2.8 DG DN | A"));
choices.insert (p_t (50517, "Sigma 24-70mm f/2.8 DG DN | A"));
choices.insert (p_t (50518, "Sigma 100-400mm f/5-6.3 DG DN OS"));
choices.insert (p_t (50518, "Sigma 100-400mm f/5-6.3 DG DN OS | C"));
choices.insert (p_t (50521, "Sigma 85mm f/1.4 DG DN | A"));
choices.insert (p_t (50522, "Sigma 105mm f/2.8 DG DN MACRO | A"));
choices.insert (p_t (50523, "Sigma 65mm f/2 DG DN | C"));
choices.insert (p_t (50524, "Sigma 35mm f/2 DG DN | C"));
choices.insert (p_t (50525, "Sigma 24mm f/3.5 DG DN | C"));
choices.insert (p_t (50526, "Sigma 28-70mm f/2.8 DG DN | C"));
choices.insert (p_t (50527, "Sigma 150-600mm f/5-6.3 DG DN OS | S"));
choices.insert (p_t (50528, "Sigma 35mm f/1.4 DG DN | A"));
choices.insert (p_t (50529, "Sigma 90mm f/2.8 DG DN | C"));
choices.insert (p_t (50530, "Sigma 24mm f/2 DG DN | C"));
choices.insert (p_t (50531, "Sigma 18-50mm f/2.8 DC DN | C"));
choices.insert (p_t (50532, "Sigma 20mm f/2 DG DN | C"));
choices.insert (p_t (50533, "Sigma 16-28mm f/2.8 DG DN | C"));
choices.insert (p_t (50992, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"));
choices.insert (p_t (50993, "Voigtlander HELIAR-HYPER WIDE 10mm f/5.6"));
choices.insert (p_t (50994, "Voigtlander ULTRA WIDE-HELIAR 12mm f/5.6 III"));
@ -1170,13 +1211,21 @@ public:
choices.insert (p_t (51001, "Voigtlander NOKTON 21mm f/1.4 Aspherical"));
choices.insert (p_t (51002, "Voigtlander APO-LANTHAR 50mm f/2 Aspherical"));
choices.insert (p_t (51003, "Voigtlander NOKTON 35mm f/1.2 Aspherical SE"));
choices.insert (p_t (51006, "Voigtlander APO-LANTHAR 35mm f/2 Aspherical"));
choices.insert (p_t (51504, "Samyang AF 50mm f/1.4"));
choices.insert (p_t (51505, "Samyang AF 14mm f/2.8 or Samyang AF 35mm f/2.8"));
choices.insert (p_t (51505, "Samyang AF 35mm f/2.8"));
choices.insert (p_t (51507, "Samyang AF 35mm f/1.4"));
choices.insert (p_t (51508, "Samyang AF 45mm f/1.8"));
choices.insert (p_t (51510, "Samyang AF 18mm f/2.8"));
choices.insert (p_t (51510, "Samyang AF 18mm f/2.8 or Samyang AF 35mm f/1.8"));
choices.insert (p_t (51510, "Samyang AF 35mm f/1.8"));
choices.insert (p_t (51512, "Samyang AF 75mm f/1.8"));
choices.insert (p_t (51513, "Samyang AF 35mm f/1.8"));
choices.insert (p_t (51514, "Samyang AF 24mm f/1.8"));
choices.insert (p_t (51515, "Samyang AF 12mm f/2.0"));
choices.insert (p_t (51516, "Samyang AF 24-70mm f/2.8"));
choices.insert (p_t (51517, "Samyang AF 50mm f/1.4 II"));
choices.insert (p_t (51518, "Samyang AF 135mm f/1.8"));
}
std::string toString (const Tag* t) const override