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

Updated rtexif using ExifTool-10.96, closes #4554

Browse Source
This commit is contained in:
Morgan Hardwood
2018-05-13 19:51:28 +02:00
parent 7d59277eb3
commit 5a092f5176
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtexif/canonattribs.cc
View File

@@ -656,6 +656,7 @@ public:
{82, "Canon TS-E 135mm f/4L Macro"},
{94, "Canon TS-E 17mm f/4L"},
{95, "Canon TS-E 24mm f/3.5L II"},
{103, "Samyang AF 14mm f/2.8 EF"},
{124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo"},
{125, "Canon TS-E 24mm f/3.5L"},
{126, "Canon TS-E 45mm f/2.8"},
@@ -860,12 +861,14 @@ public:
{254, "Canon EF 100mm f/2.8L Macro IS USM"},
{255, "Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens"},
{255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"},
{368, "Sigma 14-24mm f/2.8 DG 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"},
{491, "Canon EF 300mm f/2.8L IS II USM or Tamron Lens"},
{491, "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)"},
{491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)"},
{491, "Tamron 100-400mm f/4.5-6.3 Di VC USD (A035)"},
{492, "Canon EF 400mm f/2.8L IS II USM"},
{493, "Canon EF 500mm f/4L IS II USM or EF 24-105mm f4L IS USM"},
{493, "Canon EF 24-105mm f/4L IS USM"},
@@ -883,7 +886,7 @@ public:
{508, "Canon EF 11-24mm f/4L USM or Tamron Lens"},
{508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD"},
{747, "Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens"},
{747, "Tamron SP 150-600mm F5-6.3 Di VC USD G2"},
{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"},
{750, "Canon EF 35mm f/1.4L II USM"},
{751, "Canon EF 16-35mm f/2.8L III USM"},
@@ -1473,6 +1476,7 @@ class CAModelIDInterpreter : public ChoiceInterpreter
public:
CAModelIDInterpreter ()
{
choices[1042] = "EOS M50 / Kiss M";
choices[16842752] = "PowerShot A30";
choices[17039360] = "PowerShot S300 / Digital IXUS 300 / IXY Digital 300";
choices[17170432] = "PowerShot A20";
@@ -1736,6 +1740,7 @@ public:
choices[1074257056] = "EOS C300";
choices[1074257321] = "HF G25";
choices[1074257844] = "XC10";
choices[1074258371] = "EOS C200";
choices[2147483649] = "EOS-1D";
choices[2147484007] = "EOS-1DS";
choices[2147484008] = "EOS 10D";
@@ -1777,7 +1782,7 @@ public:
choices[2147484452] = "EOS-1D C";
choices[2147484453] = "EOS 70D";
choices[2147484454] = "EOS Rebel T5i / 700D / Kiss X7i";
choices[2147484455] = "EOS Rebel T5 / 1200D / Kiss X70";
choices[2147484455] = "EOS Rebel T5 / 1200D / Kiss X70 / Hi";
choices[2147484456] = "EOS-1D X MARK II";
choices[2147484465] = "EOS M";
choices[2147484486] = "EOS Rebel SL1 / 100D / Kiss X7";
@@ -1793,6 +1798,8 @@ public:
choices[2147484678] = "EOS 6D Mark II";
choices[2147484680] = "EOS 77D / 9000D";
choices[2147484695] = "EOS Rebel SL2 / 200D / Kiss X9";
choices[2147484706] = "EOS Rebel T100 / 4000D / 3000D";
choices[2147484722] = "EOS Rebel T7 / 2000D / 1500D / Kiss X90";
}
};
CAModelIDInterpreter caModelIDInterpreter;

6
rtexif/nikonattribs.cc
View File

@@ -1018,10 +1018,12 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"A8 48 80 98 30 30 AA 0E", "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED II"},
{"A8 48 8E 8E 30 30 C3 0E", "AF-S Nikkor 300mm f/4E PF ED VR"},
{"A8 48 8E 8E 30 30 C3 4E", "AF-S Nikkor 300mm f/4E PF ED VR"},
{"A9 48 7C 98 30 30 D4 4E", "AF-S Nikkor 180-400mm f/4E TC1.4 FL ED VR"},
{"A9 4C 31 31 14 14 C4 06", "AF-S Nikkor 20mm f/1.8G ED"},
{"A9 54 80 80 18 18 AB 0E", "AF-S Nikkor 200mm f/2G ED VR II"},
{"AA 3C 37 6E 30 30 AC 0E", "AF-S Nikkor 24-120mm f/4G ED VR"},
{"AA 48 37 5C 24 24 C5 4E", "AF-S Nikkor 24-70mm f/2.8E ED VR"},
{"AA 48 88 A4 3C 3C D5 4E", "AF-S Nikkor 180-400mm f/4E TC1.4 FL ED VR + 1.4x TC"},
{"AB 3C A0 A0 30 30 C6 4E", "AF-S Nikkor 500mm f/4E FL ED VR"},
{"AC 38 53 8E 34 3C AE 0E", "AF-S DX VR Nikkor 55-300mm f/4.5-5.6G ED"},
{"AC 3C A6 A6 30 30 C7 4E", "AF-S Nikkor 600mm f/4E FL ED VR"},
@@ -1047,9 +1049,11 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"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"},
{"C3 34 68 98 38 40 4B 4E", "Sigma 100-400mm f/5-6.3 DG OS HSM | C"},
{"C8 54 62 62 0C 0C 4B 46", "Sigma 85mm f/1.4 DG HSM | A"},
{"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"},
{"CE 47 37 5C 25 25 DF 4E", "Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)"},
{"CF 38 6E 98 34 3C 4B 0E", "Sigma APO 120-400mm f/4.5-5.6 DG OS HSM"},
{"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"},
@@ -1101,7 +1105,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"FE 53 5C 80 24 24 84 06", "Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)"},
{"FE 54 5C 80 24 24 DF 0E", "Tamron SP 70-200mm f/2.8 Di VC USD (A009)"},
{"FE 54 64 64 24 24 DF 0E", "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 (F004)"},
{"FF 40 2D 80 2C 40 4B 06", "Sigma 18-200mm f/3.5-6.3 DC"},
{"FF 40 2D 80 2C 40 4B 06", "Sigma 18-200mm f/3.5-6.3 DC"}
};
const TagAttrib nikonISOInfoAttribs[] = {

1
rtexif/olympusattribs.cc
View File

@@ -146,6 +146,7 @@ public:
lenses["01 06 00"] = "Sigma APO 50-500mm f/4.0-6.3 EX DG HSM";
lenses["01 06 10"] = "Sigma 30mm f/1.4 DC DN | C";
lenses["01 07 00"] = "Sigma Macro 105mm f/2.8 EX DG";
lenses["01 07 10"] = "Sigma 16mm f/1.4 DC DN | C (017)";
lenses["01 08 00"] = "Sigma APO Macro 150mm f/2.8 EX DG HSM";
lenses["01 09 00"] = "Sigma 18-50mm f/2.8 EX DC Macro";
lenses["01 10 00"] = "Sigma 24mm f/1.8 EX DG Aspherical Macro";

15
rtexif/sonyminoltaattribs.cc
View File

@@ -882,18 +882,21 @@ public:
{6553, "Samyang AF 50mm f/1.4 FE"},
{6553, "Samyang AF 14mm f/2.8 FE"},
{6553, "Samyang AF 35mm f/2.8 FE"},
{6553, "Samyang AF 35mm f/1.4"},
{6553, "Sigma 19mm f/2.8 [EX] DN"},
{6553, "Sigma 30mm f/2.8 [EX] DN"},
{6553, "Sigma 60mm f/2.8 DN"},
{6553, "Sigma 30mm f/1.4 DC DN | C"},
{6553, "Sigma 16mm f/1.4 DC DN | C"},
{6553, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
{6553, "Tamron 28-75mm f/2.8 Di III RXD"},
{6553, "Tokina Firin 20mm f/2 FE MF"},
{6553, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"},
{6553, "Voigtlander HELIAR-HYPER WIDE 10mm f/5.6"},
{6553, "Voigtlander ULTRA WIDE-HELIAR 12mm f/5.6 III"},
{6553, "Voigtlander MACRO APO-LANTHAR 65mm f/2 Aspherical"},
{6553, "Voigtlander NOKTON 40mm f/1.2 Aspherical"},
{6553, "Voigtlander NOKTON classic 35mm f/1.4"},
{6553, "Zeiss Touit 12mm f/2.8"},
{6553, "Zeiss Touit 32mm f/1.8"},
{6553, "Zeiss Touit 50mm f/2.8 Macro"},
@@ -905,6 +908,7 @@ public:
{6553, "Zeiss Loxia 35mm f/2"},
{6553, "Zeiss Loxia 21mm f/2.8"},
{6553, "Zeiss Loxia 85mm f/2.4"},
{6553, "Zeiss Loxia 25mm f/2.4"},
{6553, "Arax MC 35mm f/2.8 Tilt+Shift"},
{6553, "Arax MC 80mm f/2.8 Tilt+Shift"},
{6553, "Zenitar MF 16mm f/2.8 Fisheye M42"},
@@ -1089,18 +1093,21 @@ public:
{65535, "Samyang AF 50mm f/1.4 FE"},
{65535, "Samyang AF 14mm f/2.8 FE"},
{65535, "Samyang AF 35mm f/2.8 FE"},
{65535, "Samyang AF 35mm f/1.4"},
{65535, "Sigma 19mm f/2.8 [EX] DN"},
{65535, "Sigma 30mm f/2.8 [EX] DN"},
{65535, "Sigma 60mm f/2.8 DN"},
{65535, "Sigma 30mm f/1.4 DC DN | C"},
{65535, "Sigma 16mm f/1.4 DC DN | C"},
{65535, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
{65535, "Tamron 28-75mm f/2.8 Di III RXD"},
{65535, "Tokina Firin 20mm f/2 FE MF"},
{65535, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"},
{65535, "Voigtlander HELIAR-HYPER WIDE 10mm f/5.6"},
{65535, "Voigtlander ULTRA WIDE-HELIAR 12mm f/5.6 III"},
{65535, "Voigtlander MACRO APO-LANTHAR 65mm f/2 Aspherical"},
{65535, "Voigtlander NOKTON 40mm f/1.2 Aspherical"},
{65535, "Voigtlander NOKTON classic 35mm f/1.4"},
{65535, "Zeiss Touit 12mm f/2.8"},
{65535, "Zeiss Touit 32mm f/1.8"},
{65535, "Zeiss Touit 50mm f/2.8 Macro"},
@@ -1112,13 +1119,14 @@ public:
{65535, "Zeiss Loxia 35mm f/2"},
{65535, "Zeiss Loxia 21mm f/2.8"},
{65535, "Zeiss Loxia 85mm f/2.4"},
{65535, "Zeiss Loxia 25mm f/2.4"},
{65535, "Arax MC 35mm f/2.8 Tilt+Shift"},
{65535, "Arax MC 80mm f/2.8 Tilt+Shift"},
{65535, "Zenitar MF 16mm f/2.8 Fisheye M42"},
{65535, "Samyang 500mm Mirror f/8.0"},
{65535, "Pentacon Auto 135mm f/2.8"},
{65535, "Pentacon Auto 29mm f/2.8"},
{65535, "Helios 44-2 58mm f/2.0"},
{65535, "Helios 44-2 58mm f/2.0"}
};
}
@@ -1232,6 +1240,8 @@ public:
choices.insert (p_t (49233, "Zeiss Loxia 35mm f/2"));
choices.insert (p_t (49234, "Zeiss Loxia 21mm f/2.8"));
choices.insert (p_t (49235, "Zeiss Loxia 85mm f/2.4"));
choices.insert (p_t (49236, "Zeiss Loxia 25mm f/2.4"));
choices.insert (p_t (49457, "Tamron 28-75mm f/2.8 Di III RXD"));
choices.insert (p_t (50480, "Sigma 30mm f/1.4 DC DN | C"));
choices.insert (p_t (50481, "Sigma 50mm f/1.4 DG HSM | A + MC-11"));
choices.insert (p_t (50482, "Sigma 18-300mm f/3.5-6.3 DC MACRO OS HSM | C + MC-11"));
@@ -1245,14 +1255,17 @@ public:
choices.insert (p_t (50492, "Sigma 24-105mm f/4 DG OS HSM | A + MC-11"));
choices.insert (p_t (50493, "Sigma 17-70mm f/2.8-4 DC MACRO OS HSM | C + MC-11"));
choices.insert (p_t (50495, "Sigma 50-100mm f/1.8 DC HSM | A + MC-11"));
choices.insert (p_t (50501, "Sigma 100-400mm f/5-6.3 DG OS HSM | C + MC-11"));
choices.insert (p_t (50503, "Sigma 16mm f/1.4 DC 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"));
choices.insert (p_t (50995, "Voigtlander MACRO APO-LANTHAR 65mm f/2 Aspherical"));
choices.insert (p_t (50996, "Voigtlander NOKTON 40mm f/1.2 Aspherical"));
choices.insert (p_t (50997, "Voigtlander NOKTON classic 35mm f/1.4"));
choices.insert (p_t (51505, "Samyang AF 14mm f/2.8 FE or Samyang AF 35mm f/2.8 FE"));
choices.insert (p_t (51505, "Samyang AF 35mm f/2.8 FE"));
choices.insert (p_t (51507, "Samyang AF 35mm f/1.4"));
}
virtual std::string toString (Tag* t)