Skip to content

Commit

Permalink
Add new Canon model IDs
Browse files Browse the repository at this point in the history 
(cherry picked from commit 44bc543)

# Conflicts:
#	src/canonmn_int.cpp
  • Loading branch information
@kmilos @mergify
kmilos authored and mergify[bot] committed Sep 2, 2024
1 parent adb7f34 commit 2bb414f
Showing 1 changed file with 358 additions and 0 deletions.
358 changes: 358 additions & 0 deletions src/canonmn_int.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ std::ostream& printCsLensTypeByMetadata(std::ostream& os, const Value& value, co
std::ostream& printCsLensFFFF(std::ostream& os, const Value& value, const ExifData* metadata);

//! ModelId, tag 0x0010
<<<<<<< HEAD
constexpr TagDetails canonModelId[] = {{0x00000412, "EOS M50 / Kiss M"},
{0x00000801, "PowerShot SX740 HS"},
{0x00000804, "Powershot G5 X Mark II"},
Expand Down Expand Up @@ -386,6 +387,363 @@ constexpr TagDetails canonModelId[] = {{0x00000412, "EOS M50 / Kiss M"},
{0x80000498, "EOS R100"},
{0x80000520, "EOS D2000C"},
{0x80000560, "EOS D6000C"}};
=======
constexpr TagDetails canonModelId[] = {
{0x00000412, "EOS M50 / Kiss M"},
{0x00000801, "PowerShot SX740 HS"},
{0x00000804, "Powershot G5 X Mark II"},
{0x00000805, "PowerShot SX70 HS"},
{0x00000808, "PowerShot G7 X Mark III"},
{0x00000811, "EOS M6 Mark II"},
{0x00000812, "EOS M200"},
{0x01010000, "PowerShot A30"},
{0x01040000, "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"},
{0x01060000, "PowerShot A20"},
{0x01080000, "PowerShot A10"},
{0x01090000, "PowerShot S110 / Digital IXUS v / IXY Digital 200"},
{0x01100000, "PowerShot G2"},
{0x01110000, "PowerShot S40"},
{0x01120000, "PowerShot S30"},
{0x01130000, "PowerShot A40"},
{0x01140000, "EOS D30"},
{0x01150000, "PowerShot A100"},
{0x01160000, "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"},
{0x01170000, "PowerShot A200"},
{0x01180000, "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"},
{0x01190000, "PowerShot G3"},
{0x01210000, "PowerShot S45"},
{0x01230000, "PowerShot SD100 / Digital IXUS II / IXY Digital 30"},
{0x01240000, "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"},
{0x01250000, "PowerShot A70"},
{0x01260000, "PowerShot A60"},
{0x01270000, "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"},
{0x01290000, "PowerShot G5"},
{0x01300000, "PowerShot A300"},
{0x01310000, "PowerShot S50"},
{0x01340000, "PowerShot A80"},
{0x01350000, "PowerShot SD10 / Digital IXUS i / IXY Digital L"},
{0x01360000, "PowerShot S1 IS"},
{0x01370000, "PowerShot Pro1"},
{0x01380000, "PowerShot S70"},
{0x01390000, "PowerShot S60"},
{0x01400000, "PowerShot G6"},
{0x01410000, "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"},
{0x01420000, "PowerShot A75"},
{0x01440000, "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"},
{0x01450000, "PowerShot A400"},
{0x01470000, "PowerShot A310"},
{0x01490000, "PowerShot A85"},
{0x01520000, "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"},
{0x01530000, "PowerShot A95"},
{0x01540000, "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"},
{0x01550000, "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"},
{0x01560000, "PowerShot A520"},
{0x01570000, "PowerShot A510"},
{0x01590000, "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"},
{0x01640000, "PowerShot S2 IS"},
{0x01650000, "PowerShot SD430 / Digital IXUS Wireless / IXY Digital Wireless"},
{0x01660000, "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"},
{0x01668000, "EOS D60"},
{0x01700000, "PowerShot SD30 / Digital IXUS i Zoom / IXY Digital L3"},
{0x01740000, "PowerShot A430"},
{0x01750000, "PowerShot A410"},
{0x01760000, "PowerShot S80"},
{0x01780000, "PowerShot A620"},
{0x01790000, "PowerShot A610"},
{0x01800000, "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"},
{0x01810000, "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"},
{0x01820000, "PowerShot TX1"},
{0x01870000, "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"},
{0x01880000, "PowerShot A420"},
{0x01890000, "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"},
{0x01900000, "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"},
{0x01920000, "PowerShot A700"},
{0x01940000, "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"},
{0x01950000, "PowerShot S3 IS"},
{0x01960000, "PowerShot A540"},
{0x01970000, "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"},
{0x01980000, "PowerShot G7"},
{0x01990000, "PowerShot A530"},
{0x02000000, "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"},
{0x02010000, "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"},
{0x02020000, "PowerShot A710 IS"},
{0x02030000, "PowerShot A640"},
{0x02040000, "PowerShot A630"},
{0x02090000, "PowerShot S5 IS"},
{0x02100000, "PowerShot A460"},
{0x02120000, "PowerShot SD850 IS / Digital IXUS 950 IS / IXY Digital 810 IS"},
{0x02130000, "PowerShot A570 IS"},
{0x02140000, "PowerShot A560"},
{0x02150000, "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"},
{0x02160000, "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"},
{0x02180000, "PowerShot A550"},
{0x02190000, "PowerShot A450"},
{0x02230000, "PowerShot G9"},
{0x02240000, "PowerShot A650 IS"},
{0x02260000, "PowerShot A720 IS"},
{0x02290000, "PowerShot SX100 IS"},
{0x02300000, "PowerShot SD950 IS / Digital IXUS 960 IS / IXY Digital 2000 IS"},
{0x02310000, "PowerShot SD870 IS / Digital IXUS 860 IS / IXY Digital 910 IS"},
{0x02320000, "PowerShot SD890 IS / Digital IXUS 970 IS / IXY Digital 820 IS"},
{0x02360000, "PowerShot SD790 IS / Digital IXUS 90 IS / IXY Digital 95 IS"},
{0x02370000, "PowerShot SD770 IS / Digital IXUS 85 IS / IXY Digital 25 IS"},
{0x02380000, "PowerShot A590 IS"},
{0x02390000, "PowerShot A580"},
{0x02420000, "PowerShot A470"},
{0x02430000, "PowerShot SD1100 IS / Digital IXUS 80 IS / IXY Digital 20 IS"},
{0x02460000, "PowerShot SX1 IS"},
{0x02470000, "PowerShot SX10 IS"},
{0x02480000, "PowerShot A1000 IS"},
{0x02490000, "PowerShot G10"},
{0x02510000, "PowerShot A2000 IS"},
{0x02520000, "PowerShot SX110 IS"},
{0x02530000, "PowerShot SD990 IS / Digital IXUS 980 IS / IXY Digital 3000 IS"},
{0x02540000, "PowerShot SD880 IS / Digital IXUS 870 IS / IXY Digital 920 IS"},
{0x02550000, "PowerShot E1"},
{0x02560000, "PowerShot D10"},
{0x02570000, "PowerShot SD960 IS / Digital IXUS 110 IS / IXY Digital 510 IS"},
{0x02580000, "PowerShot A2100 IS"},
{0x02590000, "PowerShot A480"},
{0x02600000, "PowerShot SX200 IS"},
{0x02610000, "PowerShot SD970 IS / Digital IXUS 990 IS / IXY Digital 830 IS"},
{0x02620000, "PowerShot SD780 IS / Digital IXUS 100 IS / IXY Digital 210 IS"},
{0x02630000, "PowerShot A1100 IS"},
{0x02640000, "PowerShot SD1200 IS / Digital IXUS 95 IS / IXY Digital 110 IS"},
{0x02700000, "PowerShot G11"},
{0x02710000, "PowerShot SX120 IS"},
{0x02720000, "PowerShot S90"},
{0x02750000, "PowerShot SX20 IS"},
{0x02760000, "PowerShot SD980 IS / Digital IXUS 200 IS / IXY Digital 930 IS"},
{0x02770000, "PowerShot SD940 IS / Digital IXUS 120 IS / IXY Digital 220 IS"},
{0x02800000, "PowerShot A495"},
{0x02810000, "PowerShot A490"},
{0x02820000, "PowerShot A3100/A3150 IS"},
{0x02830000, "PowerShot A3000 IS"},
{0x02840000, "PowerShot SD1400 IS / IXUS 130 / IXY 400F"},
{0x02850000, "PowerShot SD1300 IS / IXUS 105 / IXY 200F"},
{0x02860000, "PowerShot SD3500 IS / IXUS 210 / IXY 10S"},
{0x02870000, "PowerShot SX210 IS"},
{0x02880000, "PowerShot SD4000 IS / IXUS 300 HS / IXY 30S"},
{0x02890000, "PowerShot SD4500 IS / IXUS 1000 HS / IXY 50S"},
{0x02920000, "PowerShot G12"},
{0x02930000, "PowerShot SX30 IS"},
{0x02940000, "PowerShot SX130 IS"},
{0x02950000, "PowerShot S95"},
{0x02980000, "PowerShot A3300 IS"},
{0x02990000, "PowerShot A3200 IS"},
{0x03000000, "PowerShot ELPH 500 HS / IXUS 310 HS / IXY 31S"},
{0x03010000, "PowerShot Pro90 IS"},
{0x03010001, "PowerShot A800"},
{0x03020000, "PowerShot ELPH 100 HS / IXUS 115 HS / IXY 210F"},
{0x03030000, "PowerShot SX230 HS"},
{0x03040000, "PowerShot ELPH 300 HS / IXUS 220 HS / IXY 410F"},
{0x03050000, "PowerShot A2200"},
{0x03060000, "PowerShot A1200"},
{0x03070000, "PowerShot SX220 HS"},
{0x03080000, "PowerShot G1 X"},
{0x03090000, "PowerShot SX150 IS"},
{0x03100000, "PowerShot ELPH 510 HS / IXUS 1100 HS / IXY 51S"},
{0x03110000, "PowerShot S100 (new)"},
{0x03120000, "PowerShot ELPH 310 HS / IXUS 230 HS / IXY 600F"},
{0x03130000, "PowerShot SX40 HS"},
{0x03140000, "IXY 32S"},
{0x03160000, "PowerShot A1300"},
{0x03170000, "PowerShot A810"},
{0x03180000, "PowerShot ELPH 320 HS / IXUS 240 HS / IXY 420F"},
{0x03190000, "PowerShot ELPH 110 HS / IXUS 125 HS / IXY 220F"},
{0x03200000, "PowerShot D20"},
{0x03210000, "PowerShot A4000 IS"},
{0x03220000, "PowerShot SX260 HS"},
{0x03230000, "PowerShot SX240 HS"},
{0x03240000, "PowerShot ELPH 530 HS / IXUS 510 HS / IXY 1"},
{0x03250000, "PowerShot ELPH 520 HS / IXUS 500 HS / IXY 3"},
{0x03260000, "PowerShot A3400 IS"},
{0x03270000, "PowerShot A2400 IS"},
{0x03280000, "PowerShot A2300"},
{0x03320000, "PowerShot S100V"},
{0x03330000, "PowerShot G15"},
{0x03340000, "PowerShot SX50 HS"},
{0x03350000, "PowerShot SX160 IS"},
{0x03360000, "PowerShot S110 (new)"},
{0x03370000, "PowerShot SX500 IS"},
{0x03380000, "PowerShot N"},
{0x03390000, "IXUS 245 HS / IXY 430F"},
{0x03400000, "PowerShot SX280 HS"},
{0x03410000, "PowerShot SX270 HS"},
{0x03420000, "PowerShot A3500 IS"},
{0x03430000, "PowerShot A2600"},
{0x03440000, "PowerShot SX275 HS"},
{0x03450000, "PowerShot A1400"},
{0x03460000, "PowerShot ELPH 130 IS / IXUS 140 / IXY 110F"},
{0x03470000, "PowerShot ELPH 115/120 IS / IXUS 132/135 / IXY 90F/100F"},
{0x03490000, "PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F"},
{0x03510000, "PowerShot A2500"},
{0x03540000, "PowerShot G16"},
{0x03550000, "PowerShot S120"},
{0x03560000, "PowerShot SX170 IS"},
{0x03580000, "PowerShot SX510 HS"},
{0x03590000, "PowerShot S200 (new)"},
{0x03600000, "IXY 620F"},
{0x03610000, "PowerShot N100"},
{0x03640000, "PowerShot G1 X Mark II"},
{0x03650000, "PowerShot D30"},
{0x03660000, "PowerShot SX700 HS"},
{0x03670000, "PowerShot SX600 HS"},
{0x03680000, "PowerShot ELPH 140 IS / IXUS 150 / IXY 130"},
{0x03690000, "PowerShot ELPH 135 / IXUS 145 / IXY 120"},
{0x03700000, "PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630"},
{0x03710000, "PowerShot ELPH 150 IS / IXUS 155 / IXY 140"},
{0x03740000, "EOS M3"},
{0x03750000, "PowerShot SX60 HS"},
{0x03760000, "PowerShot SX520 HS"},
{0x03770000, "PowerShot SX400 IS"},
{0x03780000, "PowerShot G7 X"},
{0x03790000, "PowerShot N2"},
{0x03800000, "PowerShot SX530 HS"},
{0x03820000, "PowerShot SX710 HS"},
{0x03830000, "PowerShot SX610 HS"},
{0x03840000, "EOS M10"},
{0x03850000, "PowerShot G3 X"},
{0x03860000, "PowerShot ELPH 165 HS / IXUS 165 / IXY 160"},
{0x03870000, "PowerShot ELPH 160 / IXUS 160"},
{0x03880000, "PowerShot ELPH 350 HS / IXUS 275 HS / IXY 640"},
{0x03890000, "PowerShot ELPH 170 IS / IXUS 170"},
{0x03910000, "PowerShot SX410 IS"},
{0x03930000, "PowerShot G9 X"},
{0x03940000, "EOS M5"},
{0x03950000, "PowerShot G5 X"},
{0x03970000, "PowerShot G7 X Mark II"},
{0x03980000, "EOS M100"},
{0x03990000, "PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650"},
{0x04010000, "PowerShot SX540 HS"},
{0x04020000, "PowerShot SX420 IS"},
{0x04030000, "PowerShot ELPH 190 IS / IXUS 180 / IXY 190"},
{0x04040000, "PowerShot G1"},
{0x04040001, "PowerShot ELPH 180 IS / IXUS 175 / IXY 180"},
{0x04050000, "PowerShot SX720 HS"},
{0x04060000, "PowerShot SX620 HS"},
{0x04070000, "EOS M6"},
{0x04100000, "PowerShot G9 X Mark II"},
{0x04150000, "PowerShot ELPH 185 / IXUS 185 / IXY 200"},
{0x04160000, "PowerShot SX430 IS"},
{0x04170000, "PowerShot SX730 HS"},
{0x04180000, "PowerShot G1 X Mark III"},
{0x06040000, "PowerShot S100 / Digital IXUS / IXY Digital"},
{0x4007d673, "DC19/DC21/DC22"},
{0x4007d674, "XH A1"},
{0x4007d675, "HV10"},
{0x4007d676, "MD130/MD140/MD150/MD160/ZR850"},
{0x4007d777, "DC50"},
{0x4007d778, "HV20"},
{0x4007d779, "DC211"},
{0x4007d77a, "HG10"},
{0x4007d77b, "HR10"},
{0x4007d77d, "MD255/ZR950"},
{0x4007d81c, "HF11"},
{0x4007d878, "HV30"},
{0x4007d87c, "XH A1S"},
{0x4007d87e, "DC301/DC310/DC311/DC320/DC330"},
{0x4007d87f, "FS100"},
{0x4007d880, "HF10"},
{0x4007d882, "HG20/HG21"},
{0x4007d925, "HF21"},
{0x4007d926, "HF S11"},
{0x4007d978, "HV40"},
{0x4007d987, "DC410/DC411/DC420"},
{0x4007d988, "FS19/FS20/FS21/FS22/FS200"},
{0x4007d989, "HF20/HF200"},
{0x4007d98a, "HF S10/S100"},
{0x4007da8e, "HF R10/R16/R17/R18/R100/R106"},
{0x4007da8f, "HF M30/M31/M36/M300/M306"},
{0x4007da90, "HF S20/S21/S200"},
{0x4007da92, "FS31/FS36/FS37/FS300/FS305/FS306/FS307"},
{0x4007dca0, "EOS C300"},
{0x4007dda9, "HF G25"},
{0x4007dfb4, "XC10"},
{0x4007e1c3, "EOS C200"},
{0x80000001, "EOS-1D"},
{0x80000167, "EOS-1DS"},
{0x80000168, "EOS 10D"},
{0x80000169, "EOS-1D Mark III"},
{0x80000170, "EOS Digital Rebel / 300D / Kiss Digital"},
{0x80000174, "EOS-1D Mark II"},
{0x80000175, "EOS 20D"},
{0x80000176, "EOS Digital Rebel XSi / 450D / Kiss X2"},
{0x80000188, "EOS-1Ds Mark II"},
{0x80000189, "EOS Digital Rebel XT / 350D / Kiss Digital N"},
{0x80000190, "EOS 40D"},
{0x80000213, "EOS 5D"},
{0x80000215, "EOS-1Ds Mark III"},
{0x80000218, "EOS 5D Mark II"},
{0x80000219, "WFT-E1"},
{0x80000232, "EOS-1D Mark II N"},
{0x80000234, "EOS 30D"},
{0x80000236, "EOS Digital Rebel XTi / 400D / Kiss Digital X"},
{0x80000241, "WFT-E2"},
{0x80000246, "WFT-E3"},
{0x80000250, "EOS 7D"},
{0x80000252, "EOS Rebel T1i / 500D / Kiss X3"},
{0x80000254, "EOS Rebel XS / 1000D / Kiss F"},
{0x80000261, "EOS 50D"},
{0x80000269, "EOS-1D X"},
{0x80000270, "EOS Rebel T2i / 550D / Kiss X4"},
{0x80000271, "WFT-E4"},
{0x80000273, "WFT-E5"},
{0x80000281, "EOS-1D Mark IV"},
{0x80000285, "EOS 5D Mark III"},
{0x80000286, "EOS Rebel T3i / 600D / Kiss X5"},
{0x80000287, "EOS 60D"},
{0x80000288, "EOS Rebel T3 / 1100D / Kiss X50"},
{0x80000289, "EOS 7D Mark II"},
{0x80000297, "WFT-E2 II"},
{0x80000298, "WFT-E4 II"},
{0x80000301, "EOS Rebel T4i / 650D / Kiss X6i"},
{0x80000302, "EOS 6D"},
{0x80000324, "EOS-1D C"},
{0x80000325, "EOS 70D"},
{0x80000326, "EOS Rebel T5i / 700D / Kiss X7i"},
{0x80000327, "EOS Rebel T5 / 1200D / Kiss X70 / Hi"},
{0x80000328, "EOS-1D X Mark II"},
{0x80000331, "EOS M"},
{0x80000346, "EOS Rebel SL1 / 100D / Kiss X7"},
{0x80000347, "EOS Rebel T6s / 760D / 8000D"},
{0x80000349, "EOS 5D Mark IV"},
{0x80000350, "EOS 80D"},
{0x80000355, "EOS M2"},
{0x80000382, "EOS 5DS"},
{0x80000393, "EOS Rebel T6i / 750D / Kiss X8i"},
{0x80000401, "EOS 5DS R"},
{0x80000404, "EOS Rebel T6 / 1300D / Kiss X80"},
{0x80000405, "EOS Rebel T7i / 800D / Kiss X9i"},
{0x80000406, "EOS 6D Mark II"},
{0x80000408, "EOS 77D / 9000D"},
{0x80000417, "EOS Rebel SL2 / 200D / Kiss X9"},
{0x80000421, "EOS R5"},
{0x80000422, "EOS Rebel T100 / 4000D / 3000D"},
{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 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"},
{0x80000487, "EOS R8"},
{0x80000491, "PowerShot V10"},
{0x80000495, "EOS R1"},
{0x80000496, "EOS R5 Mark II"},
{0x80000498, "EOS R100"},
{0x80000520, "EOS D2000C"},
{0x80000560, "EOS D6000C"},
};
>>>>>>> 44bc5436a (Add new Canon model IDs)

//! SerialNumberFormat, tag 0x0015
constexpr TagDetails canonSerialNumberFormat[] = {
Expand Down

0 comments on commit 2bb414f

Please sign in to comment.