Skip to content

Commit

Permalink
Update some Canon IDs
Browse files Browse the repository at this point in the history
  • Loading branch information
@kmilos
kmilos committed Feb 8, 2023
1 parent 7e40da7 commit caf8436
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions src/canonmn_int.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,21 +366,22 @@ 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"},
{0x80000464, "EOS R7"},
{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"}};

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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_[] = {
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/pr_2216.exv.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit caf8436

Please sign in to comment.