From f20977c4fa6bc442aa21322d117cb6407215fbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Wed, 20 Sep 2023 14:52:08 +0200 Subject: [PATCH] Add a few more IDs for cameras and lenses --- src/canonmn_int.cpp | 20 +++++++++++++++++--- src/nikonmn_int.cpp | 4 ++++ src/pentaxmn_int.cpp | 3 +++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index 3dcbef9349..c5952e798c 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -383,6 +383,8 @@ constexpr TagDetails canonModelId[] = {{0x00000412, "EOS M50 / Kiss M"}, {0x80000480, "EOS R50"}, {0x80000481, "EOS R6 Mark II"}, {0x80000487, "EOS R8"}, + {0x80000491, "PowerShot V10"}, + {0x80000498, "EOS R100"}, {0x80000520, "EOS D2000C"}, {0x80000560, "EOS D6000C"}}; @@ -1946,6 +1948,8 @@ constexpr TagDetails canonCsLensType[] = {{1, "Canon EF 50mm f/1.8"}, {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 600mm F4L IS USM + RF1.4x"}, + {61182, "Canon RF 600mm F4L IS USM + RF2x"}, {61182, "Canon RF 800mm F5.6L IS USM"}, {61182, "Canon RF 800mm F5.6L IS USM + RF1.4x"}, {61182, "Canon RF 800mm F5.6L IS USM + RF2x"}, @@ -1956,7 +1960,11 @@ constexpr TagDetails canonCsLensType[] = {{1, "Canon EF 50mm f/1.8"}, {61182, "Canon RF 135mm F1.8 L IS USM"}, {61182, "Canon RF 24-50mm F4.5-6.3 IS STM"}, {61182, "Canon RF-S 55-210mm F5-7.1 IS STM"}, - {65535, "n/a"}}; + {61182, "Canon RF 100-300mm F2.8L IS USM"}, + {61182, "Canon RF 100-300mm F2.8L IS USM + RF1.4x"}, + {61182, "Canon RF 100-300mm F2.8L IS USM + RF2x"}, + {61182, "Canon RF 28mm F2.8 STM"}, + {65535, N_("n/a")}}; //! FlashActivity, tag 0x001c constexpr TagDetails canonCsFlashActivity[] = {{0, N_("Did not fire")}, {1, N_("Fired")}}; @@ -2324,7 +2332,7 @@ constexpr TagDetails canonToningEffect[] = { {0, N_("None")}, {1, N_("Sepia")}, {2, N_("Blue")}, {3, N_("Purple")}, {4, N_("Green")}}; //! RFLensType, tag 0x003D -// from https://github.com/exiftool/exiftool/blob/12.49/lib/Image/ExifTool/Canon.pm#L6791 +// from https://github.com/exiftool/exiftool/blob/12.67/lib/Image/ExifTool/Canon.pm#L6833 constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")}, {257, "Canon RF 50mm F1.2L USM"}, {258, "Canon RF 24-105mm F4L IS USM"}, @@ -2362,6 +2370,8 @@ constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")}, {290, "Canon RF 400mm F2.8L IS USM + RF1.4x"}, {291, "Canon RF 400mm F2.8L IS USM + RF2x"}, {292, "Canon RF 600mm F4L IS USM"}, + {293, "Canon RF 600mm F4L IS USM + RF1.4x"}, + {294, "Canon RF 600mm F4L IS USM + RF2x"}, {295, "Canon RF 800mm F5.6L IS USM"}, {296, "Canon RF 800mm F5.6L IS USM + RF1.4x"}, {297, "Canon RF 800mm F5.6L IS USM + RF2x"}, @@ -2371,7 +2381,11 @@ constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")}, {302, "Canon RF 15-30mm F4.5-6.3 IS STM"}, {303, "Canon RF 135mm F1.8 L IS USM"}, {304, "Canon RF 24-50mm F4.5-6.3 IS STM"}, - {305, "Canon RF-S 55-210mm F5-7.1 IS STM"}}; + {305, "Canon RF-S 55-210mm F5-7.1 IS STM"}, + {306, "Canon RF 100-300mm F2.8L IS USM"}, + {307, "Canon RF 100-300mm F2.8L IS USM + RF1.4x"}, + {308, "Canon RF 100-300mm F2.8L IS USM + RF2x"}, + {313, "Canon RF 28mm F2.8 STM"}}; // Canon File Info Tag constexpr TagInfo CanonMakerNote::tagInfoFi_[] = { diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 8cd172bf66..54a67bbc94 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -3849,6 +3849,10 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value& {38, "Nikon", "Nikkor Z 85mm f/1.2 S"}, // 28 {39, "Nikon", "Nikkor Z 17-28mm f/2.8"}, // IB {40, "Nikon", "Nikkor Z 26mm f/2.8"}, + {41, "Nikon", "Nikkor Z DX 12-28mm f/3.5-5.6 PZ VR"}, + {42, "Nikon", "Nikkor Z 180-600mm f/5.6-6.3 VR"}, + {43, "Nikon", "Nikkor Z DX 24mm f/1.7"}, + {44, "Nikon", "Nikkor Z 70-180mm f/2.8"}, }; auto lid = static_cast(value.toInt64()); diff --git a/src/pentaxmn_int.cpp b/src/pentaxmn_int.cpp index db92fd5c4a..2e1ba07de0 100644 --- a/src/pentaxmn_int.cpp +++ b/src/pentaxmn_int.cpp @@ -165,6 +165,8 @@ constexpr TagDetails pentaxModel[] = { {0x13240, "K-1 Mark II"}, {0x13254, "K-3 Mark III"}, {0x13290, "WG-70"}, + {0x1329a, "GR IIIx"}, + {0x132d6, "K-3 Mark III Monochrome"}, }; //! Quality, tag 0x0008 @@ -663,6 +665,7 @@ constexpr TagDetails pentaxLensType[] = { {0x0402, "smc PENTAX-FA 80-320mm F4.5-5.6"}, {0x0403, "smc PENTAX-FA 43mm F1.9 Limited"}, {0x0406, "smc PENTAX-FA 35-80mm F4-5.6"}, + {0x0407, "Irix 45mm F/1.4"}, {0x0408, "Irix 150mm F/2.8 Macro"}, {0x0409, "Irix 11mm F/4"}, {0x040a, "Irix 15mm F/2.4"},