From caf843655e712d5fe5049a8594e23bc9e95c8aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Wed, 8 Feb 2023 11:49:46 +0100 Subject: [PATCH] Update some Canon IDs --- src/canonmn_int.cpp | 11 +++++++---- test/data/test_reference_files/pr_2216.exv.out | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index 3c4aa5ee8f..aa1cb9c40c 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -366,12 +366,12 @@ constexpr TagDetails canonModelId[] = {{0x00000412, "EOS M50 / Kiss M"}, {0x80000417, "EOS Rebel SL2 / 200D / Kiss X9"}, {0x80000421, "EOS R5"}, {0x80000422, "EOS Rebel T100 / 4000D / 3000D"}, - {0x80000424, "EOS R"}, + {0x80000424, "EOS R / Ra"}, {0x80000428, "EOS-1D X Mark III"}, {0x80000432, "EOS Rebel T7 / 2000D / 1500D / Kiss X90"}, {0x80000433, "EOS RP"}, {0x80000435, "EOS Rebel T8i / 850D / Kiss X10i"}, - {0x80000436, "EOS SL3 / 250D / Kiss X10"}, + {0x80000436, "EOS Rebel SL3 / 250D / 200D Mark II / Kiss X10"}, {0x80000437, "EOS 90D"}, {0x80000450, "EOS R3"}, {0x80000453, "EOS R6"}, @@ -379,8 +379,9 @@ constexpr TagDetails canonModelId[] = {{0x00000412, "EOS M50 / Kiss M"}, {0x80000465, "EOS R10"}, {0x80000467, "PowerShot ZOOM"}, {0x80000468, "EOS M50 Mark II / Kiss M2"}, + {0x80000480, "EOS R50"}, {0x80000481, "EOS R6 Mark II"}, - //{ (long int)tbd, "EOS Ra" }, + {0x80000487, "EOS R8"}, {0x80000520, "EOS D2000C"}, {0x80000560, "EOS D6000C"}}; @@ -1951,6 +1952,7 @@ constexpr TagDetails canonCsLensType[] = {{1, "Canon EF 50mm f/1.8"}, {61182, "Canon RF 1200mm F8L IS USM + RF1.4x"}, {61182, "Canon RF 1200mm F8L IS USM + RF2x"}, {61182, "Canon RF 15-30mm F4.5-6.3 IS STM"}, + {61182, "Canon RF 24-50mm F4.5-6.3 IS STM"}, {65535, "n/a"}}; //! FlashActivity, tag 0x001c @@ -2363,7 +2365,8 @@ constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")}, {298, "Canon RF 1200mm F8L IS USM"}, {299, "Canon RF 1200mm F8L IS USM + RF1.4x"}, {300, "Canon RF 1200mm F8L IS USM + RF2x"}, - {302, "Canon RF 15-30mm F4.5-6.3 IS STM"}}; + {302, "Canon RF 15-30mm F4.5-6.3 IS STM"}, + {304, "Canon RF 24-50mm F4.5-6.3 IS STM"}}; // Canon File Info Tag constexpr TagInfo CanonMakerNote::tagInfoFi_[] = { diff --git a/test/data/test_reference_files/pr_2216.exv.out b/test/data/test_reference_files/pr_2216.exv.out index 9ed6008fb5..6829652043 100644 --- a/test/data/test_reference_files/pr_2216.exv.out +++ b/test/data/test_reference_files/pr_2216.exv.out @@ -149,7 +149,7 @@ Exif.CanonCf.SetButtonFunction Short 1 1 1 Exif.CanonCf.SensorCleaning Short 1 0 0 Exif.CanonCf.SuperimposedDisplay Short 1 0 0 Exif.CanonCf.ShutterReleaseNoCFCard Short 1 0 0 -Exif.Canon.ModelID Long 1 2147484708 EOS R +Exif.Canon.ModelID Long 1 2147484708 EOS R / Ra Exif.Canon.ThumbnailImageValidArea Short 4 0 159 6 113 0 159 6 113 Exif.Canon.AFInfo Short 608 1216 13 143 1 6720 4480 6720 4480 468 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 441 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 65535 1216 13 143 1 6720 4480 6720 4480 468 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 441 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 65535 Exif.Canon.AFInfoSize SShort 1 1216 1216