diff --git a/rtexif/canonattribs.cc b/rtexif/canonattribs.cc index eb2378696..c1ab6f4f2 100644 --- a/rtexif/canonattribs.cc +++ b/rtexif/canonattribs.cc @@ -650,8 +650,11 @@ public: choices.insert (p_t (53, "Canon EF-S 18-55mm f/3.5-5.6 III")); choices.insert (p_t (54, "Canon EF-S 55-250mm f/4-5.6 IS II")); choices.insert (p_t (60, "Irix 11mm f/4")); + choices.insert (p_t (80, "Canon TS-E 50mm f/2.8L Macro")); + choices.insert (p_t (81, "Canon TS-E 90mm f/2.8L Macro")); + choices.insert (p_t (82, "Canon TS-E 135mm f/4L Macro")); choices.insert (p_t (94, "Canon TS-E 17mm f/4L")); - choices.insert (p_t (95, "Canon TS-E 24.0mm f/3.5 L II")); + choices.insert (p_t (95, "Canon TS-E 24mm f/3.5L II")); choices.insert (p_t (124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo")); choices.insert (p_t (125, "Canon TS-E 24mm f/3.5L")); choices.insert (p_t (126, "Canon TS-E 45mm f/2.8")); @@ -904,7 +907,11 @@ public: choices.insert (p_t (4160, "Canon EF-S 35mm f/2.8 Macro IS STM")); choices.insert (p_t (36910, "Canon EF 70-300mm f/4-5.6 IS II USM")); choices.insert (p_t (36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM")); + choices.insert (p_t (61491, "Canon CN-E 14mm T3.1 L F")); + choices.insert (p_t (61492, "Canon CN-E 24mm T1.5 L F")); choices.insert (p_t (61494, "Canon CN-E 85mm T1.3 L F")); + choices.insert (p_t (61495, "Canon CN-E 135mm T2.2 L F")); + choices.insert (p_t (61496, "Canon CN-E 35mm T1.5 L F")); choices.insert (p_t (65535, "n/a")); } @@ -1679,6 +1686,7 @@ public: choices[60030976] = "EOS M5"; choices[60096512] = "PowerShot G5 X"; choices[60227584] = "PowerShot G7 X Mark II"; + choices[60293120] = "EOS M100"; choices[60358656] = "PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650"; choices[67174400] = "PowerShot SX540 HS"; choices[67239936] = "PowerShot SX420 IS"; @@ -1721,6 +1729,7 @@ public: choices[1074256527] = "HF M30/M31/M36/M300/M306"; choices[1074256528] = "HF S20/S21/S200"; choices[1074256530] = "FS31/FS36/FS37/FS300/FS305/FS306/FS307"; + choices[1074257056] = "EOS C300"; choices[1074257321] = "HF G25"; choices[1074257844] = "XC10"; choices[2147483649] = "EOS-1D"; diff --git a/rtexif/nikonattribs.cc b/rtexif/nikonattribs.cc index 781224a5f..cfdf61edb 100644 --- a/rtexif/nikonattribs.cc +++ b/rtexif/nikonattribs.cc @@ -557,8 +557,10 @@ public: }; NALensDataInterpreter naLensDataInterpreter; const std::map NALensDataInterpreter::lenses = { - // The key is a composite string made of 8 HEX bytes - // LensIDNumber LensFStops MinFocalLength MaxFocalLength MaxApertureAtMinFocal MaxApertureAtMaxFocal MCUVersion and LensType + /* + * The Nikon LensID is constructed as a Composite tag from the raw hex values of 8 other tags: + * LensIDNumber, LensFStops, MinFocalLength, MaxFocalLength, MaxApertureAtMinFocal, MaxApertureAtMaxFocal, MCUVersion and LensType, in that order. + */ {"00 00 00 00 00 00 00 01", "Manual Lens No CPU"}, {"00 00 00 00 00 00 E1 12", "TC-17E II"}, {"00 00 00 00 00 00 F1 0C", "TC-14E [II] or Sigma APO Tele Converter 1.4x EX DG or Kenko Teleplus PRO 300 DG 1.4x"}, @@ -953,6 +955,7 @@ const std::map NALensDataInterpreter::lenses = { {"92 48 24 37 24 24 94 06", "AF-S Zoom-Nikkor 14-24mm f/2.8G ED"}, {"93 48 37 5C 24 24 95 06", "AF-S Zoom-Nikkor 24-70mm f/2.8G ED"}, {"94 40 2D 53 2C 3C 96 06", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED II"}, + {"94 48 7C 7C 24 24 4B 0E", "Sigma 180mm f/2.8 APO Macro EX DG OS"}, {"95 00 37 37 2C 2C 97 06", "PC-E Nikkor 24mm f/3.5D ED"}, {"95 4C 37 37 2C 2C 97 02", "PC-E Nikkor 24mm f/3.5D ED"}, {"96 38 1F 37 34 3C 4B 06", "Sigma 12-24mm f/4.5-5.6 II DG HSM"}, diff --git a/rtexif/sonyminoltaattribs.cc b/rtexif/sonyminoltaattribs.cc index 7680e53eb..083affa72 100644 --- a/rtexif/sonyminoltaattribs.cc +++ b/rtexif/sonyminoltaattribs.cc @@ -665,6 +665,12 @@ public: {128, "Sigma 18-35mm f/1.8 DC HSM"}, {128, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"}, {128, "Sigma 24-105mm f/4 DG HSM | A"}, + {128, "Sigma 30mm f/1.4"}, + {128, "Sigma 35mm f/1.4 DG HSM | A"}, + {128, "Sigma 105mm f/2.8 EX DG OS HSM Macro"}, + {128, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"}, + {128, "Sigma 18-300mm f/3.5-6.3 DC Macro HSM | C"}, + {128, "Sigma 18-50mm f/2.8-4.5 DC HSM"}, {129, "Tamron Lens (129)"}, {129, "Tamron 200-400mm f/5.6 LD"}, {129, "Tamron 70-300mm f/4-5.6 LD"}, diff --git a/tools/generateRtexifUpdates b/tools/generateRtexifUpdates index 95a32c088..cdc0dd70c 100755 --- a/tools/generateRtexifUpdates +++ b/tools/generateRtexifUpdates @@ -11,7 +11,7 @@ # Blame DrSlony # Please report bugs or enhancements to https://github.com/Beep6581/RawTherapee -et="$HOME/programs/Image-ExifTool-10.61/exiftool" +et="$HOME/programs/code-exiftool/exiftool" hash "$et" 2>/dev/null || { echo >&2 "ExifTool not found, install it first."; exit 1; } hash xmlstarlet 2>/dev/null || { echo >&2 "XMLStarlet not found, install it first."; exit 1; }