Add a few more IDs for cameras and lenses

(cherry picked from commit f20977c) # Conflicts: # src/canonmn_int.cpp
1div0 · Sep 27, 2023 · fe44c8c · fe44c8c
1 parent bec05da
commit fe44c8c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp
@@ -387,6 +387,8 @@ constexpr TagDetails canonModelId[] = {
     {0x80000480, "EOS R50"},
     {0x80000481, "EOS R6 Mark II"},
     {0x80000487, "EOS R8"},
+    {0x80000491, "PowerShot V10"},
+    {0x80000498, "EOS R100"},
     {0x80000520, "EOS D2000C"},
     {0x80000560, "EOS D6000C"},
 };
@@ -2062,6 +2064,8 @@ constexpr TagDetails canonCsLensType[] = {
     {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"},
@@ -2072,7 +2076,11 @@ constexpr TagDetails canonCsLensType[] = {
     {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
@@ -2490,7 +2498,7 @@ constexpr TagDetails canonToningEffect[] = {
 };
 
 //! 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"},
@@ -2529,6 +2537,8 @@ constexpr TagDetails canonRFLensType[] = {
     {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"},
@@ -2539,6 +2549,10 @@ constexpr TagDetails canonRFLensType[] = {
     {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"},
+    {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

diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
@@ -3943,6 +3943,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<uint16_t>(value.toInt64());

diff --git 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
@@ -664,6 +666,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"},