xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more Canon RF lenses and camera IDs

Browse Source
main
Miloš Komarčević 3 years ago
parent 75f7285487
commit c077a06ada
1 changed files with 264 additions and 241 deletions
Show Stats Download Patch File Download Diff File

505
src/canonmn_int.cpp
Unescape Escape View File

@ -35,246 +35,246 @@ std::ostream& printCsLensTypeByMetadata(std::ostream& os, const Value& value, co
std::ostream& printCsLensFFFF(std::ostream& os, const Value& value, const ExifData* metadata); std::ostream& printCsLensFFFF(std::ostream& os, const Value& value, const ExifData* metadata);
//! ModelId, tag 0x0010 //! ModelId, tag 0x0010
constexpr TagDetails canonModelId[] = {{0x00000811, "EOS M6 Mark II"}, constexpr TagDetails canonModelId[] = {{0x00000412, "EOS M50 / Kiss M"},
{0x00000801, "PowerShot SX740 HS"},
{0x00000804, "Powershot G5 X Mark II"}, {0x00000804, "Powershot G5 X Mark II"},
{0x00000805, "PowerShot SX70 HS"}, {0x00000805, "PowerShot SX70 HS"},
{0x00000808, "PowerShot G7 X Mark III"}, {0x00000808, "PowerShot G7 X Mark III"},
{0x00000811, "EOS M6 Mark II"},
{0x00000812, "EOS M200"}, {0x00000812, "EOS M200"},
{0x1010000, "PowerShot A30"}, {0x01010000, "PowerShot A30"},
{0x1040000, "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"}, {0x01040000, "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"},
{0x1060000, "PowerShot A20"}, {0x01060000, "PowerShot A20"},
{0x1080000, "PowerShot A10"}, {0x01080000, "PowerShot A10"},
{0x1090000, "PowerShot S110 / Digital IXUS v / IXY Digital 200"}, {0x01090000, "PowerShot S110 / Digital IXUS v / IXY Digital 200"},
{0x1100000, "PowerShot G2"}, {0x01100000, "PowerShot G2"},
{0x1110000, "PowerShot S40"}, {0x01110000, "PowerShot S40"},
{0x1120000, "PowerShot S30"}, {0x01120000, "PowerShot S30"},
{0x1130000, "PowerShot A40"}, {0x01130000, "PowerShot A40"},
{0x1140000, "EOS D30"}, {0x01140000, "EOS D30"},
{0x1150000, "PowerShot A100"}, {0x01150000, "PowerShot A100"},
{0x1160000, "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"}, {0x01160000, "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"},
{0x1170000, "PowerShot A200"}, {0x01170000, "PowerShot A200"},
{0x1180000, "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"}, {0x01180000, "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"},
{0x1190000, "PowerShot G3"}, {0x01190000, "PowerShot G3"},
{0x1210000, "PowerShot S45"}, {0x01210000, "PowerShot S45"},
{0x1230000, "PowerShot SD100 / Digital IXUS II / IXY Digital 30"}, {0x01230000, "PowerShot SD100 / Digital IXUS II / IXY Digital 30"},
{0x1240000, "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"}, {0x01240000, "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"},
{0x1250000, "PowerShot A70"}, {0x01250000, "PowerShot A70"},
{0x1260000, "PowerShot A60"}, {0x01260000, "PowerShot A60"},
{0x1270000, "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"}, {0x01270000, "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"},
{0x1290000, "PowerShot G5"}, {0x01290000, "PowerShot G5"},
{0x1300000, "PowerShot A300"}, {0x01300000, "PowerShot A300"},
{0x1310000, "PowerShot S50"}, {0x01310000, "PowerShot S50"},
{0x1340000, "PowerShot A80"}, {0x01340000, "PowerShot A80"},
{0x1350000, "PowerShot SD10 / Digital IXUS i / IXY Digital L"}, {0x01350000, "PowerShot SD10 / Digital IXUS i / IXY Digital L"},
{0x1360000, "PowerShot S1 IS"}, {0x01360000, "PowerShot S1 IS"},
{0x1370000, "PowerShot Pro1"}, {0x01370000, "PowerShot Pro1"},
{0x1380000, "PowerShot S70"}, {0x01380000, "PowerShot S70"},
{0x1390000, "PowerShot S60"}, {0x01390000, "PowerShot S60"},
{0x1400000, "PowerShot G6"}, {0x01400000, "PowerShot G6"},
{0x1410000, "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"}, {0x01410000, "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"},
{0x1420000, "PowerShot A75"}, {0x01420000, "PowerShot A75"},
{0x1440000, "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"}, {0x01440000, "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"},
{0x1450000, "PowerShot A400"}, {0x01450000, "PowerShot A400"},
{0x1470000, "PowerShot A310"}, {0x01470000, "PowerShot A310"},
{0x1490000, "PowerShot A85"}, {0x01490000, "PowerShot A85"},
{0x1520000, "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"}, {0x01520000, "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"},
{0x1530000, "PowerShot A95"}, {0x01530000, "PowerShot A95"},
{0x1540000, "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"}, {0x01540000, "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"},
{0x1550000, "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"}, {0x01550000, "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"},
{0x1560000, "PowerShot A520"}, {0x01560000, "PowerShot A520"},
{0x1570000, "PowerShot A510"}, {0x01570000, "PowerShot A510"},
{0x1590000, "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"}, {0x01590000, "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"},
{0x1640000, "PowerShot S2 IS"}, {0x01640000, "PowerShot S2 IS"},
{0x1650000, "PowerShot SD430 / Digital IXUS Wireless / IXY Digital Wireless"}, {0x01650000, "PowerShot SD430 / Digital IXUS Wireless / IXY Digital Wireless"},
{0x1660000, "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"}, {0x01660000, "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"},
{0x1668000, "EOS D60"}, {0x01668000, "EOS D60"},
{0x1700000, "PowerShot SD30 / Digital IXUS i Zoom / IXY Digital L3"}, {0x01700000, "PowerShot SD30 / Digital IXUS i Zoom / IXY Digital L3"},
{0x1740000, "PowerShot A430"}, {0x01740000, "PowerShot A430"},
{0x1750000, "PowerShot A410"}, {0x01750000, "PowerShot A410"},
{0x1760000, "PowerShot S80"}, {0x01760000, "PowerShot S80"},
{0x1780000, "PowerShot A620"}, {0x01780000, "PowerShot A620"},
{0x1790000, "PowerShot A610"}, {0x01790000, "PowerShot A610"},
{0x1800000, "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"}, {0x01800000, "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"},
{0x1810000, "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"}, {0x01810000, "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"},
{0x1820000, "PowerShot TX1"}, {0x01820000, "PowerShot TX1"},
{0x1870000, "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"}, {0x01870000, "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"},
{0x1880000, "PowerShot A420"}, {0x01880000, "PowerShot A420"},
{0x1890000, "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"}, {0x01890000, "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"},
{0x1900000, "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"}, {0x01900000, "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"},
{0x1920000, "PowerShot A700"}, {0x01920000, "PowerShot A700"},
{0x1940000, "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"}, {0x01940000, "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"},
{0x1950000, "PowerShot S3 IS"}, {0x01950000, "PowerShot S3 IS"},
{0x1960000, "PowerShot A540"}, {0x01960000, "PowerShot A540"},
{0x1970000, "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"}, {0x01970000, "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"},
{0x1980000, "PowerShot G7"}, {0x01980000, "PowerShot G7"},
{0x1990000, "PowerShot A530"}, {0x01990000, "PowerShot A530"},
{0x2000000, "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"}, {0x02000000, "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"},
{0x2010000, "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"}, {0x02010000, "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"},
{0x2020000, "PowerShot A710 IS"}, {0x02020000, "PowerShot A710 IS"},
{0x2030000, "PowerShot A640"}, {0x02030000, "PowerShot A640"},
{0x2040000, "PowerShot A630"}, {0x02040000, "PowerShot A630"},
{0x2090000, "PowerShot S5 IS"}, {0x02090000, "PowerShot S5 IS"},
{0x2100000, "PowerShot A460"}, {0x02100000, "PowerShot A460"},
{0x2120000, "PowerShot SD850 IS / Digital IXUS 950 IS / IXY Digital 810 IS"}, {0x02120000, "PowerShot SD850 IS / Digital IXUS 950 IS / IXY Digital 810 IS"},
{0x2130000, "PowerShot A570 IS"}, {0x02130000, "PowerShot A570 IS"},
{0x2140000, "PowerShot A560"}, {0x02140000, "PowerShot A560"},
{0x2150000, "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"}, {0x02150000, "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"},
{0x2160000, "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"}, {0x02160000, "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"},
{0x2180000, "PowerShot A550"}, {0x02180000, "PowerShot A550"},
{0x2190000, "PowerShot A450"}, {0x02190000, "PowerShot A450"},
{0x2230000, "PowerShot G9"}, {0x02230000, "PowerShot G9"},
{0x2240000, "PowerShot A650 IS"}, {0x02240000, "PowerShot A650 IS"},
{0x2260000, "PowerShot A720 IS"}, {0x02260000, "PowerShot A720 IS"},
{0x2290000, "PowerShot SX100 IS"}, {0x02290000, "PowerShot SX100 IS"},
{0x2300000, "PowerShot SD950 IS / Digital IXUS 960 IS / IXY Digital 2000 IS"}, {0x02300000, "PowerShot SD950 IS / Digital IXUS 960 IS / IXY Digital 2000 IS"},
{0x2310000, "PowerShot SD870 IS / Digital IXUS 860 IS / IXY Digital 910 IS"}, {0x02310000, "PowerShot SD870 IS / Digital IXUS 860 IS / IXY Digital 910 IS"},
{0x2320000, "PowerShot SD890 IS / Digital IXUS 970 IS / IXY Digital 820 IS"}, {0x02320000, "PowerShot SD890 IS / Digital IXUS 970 IS / IXY Digital 820 IS"},
{0x2360000, "PowerShot SD790 IS / Digital IXUS 90 IS / IXY Digital 95 IS"}, {0x02360000, "PowerShot SD790 IS / Digital IXUS 90 IS / IXY Digital 95 IS"},
{0x2370000, "PowerShot SD770 IS / Digital IXUS 85 IS / IXY Digital 25 IS"}, {0x02370000, "PowerShot SD770 IS / Digital IXUS 85 IS / IXY Digital 25 IS"},
{0x2380000, "PowerShot A590 IS"}, {0x02380000, "PowerShot A590 IS"},
{0x2390000, "PowerShot A580"}, {0x02390000, "PowerShot A580"},
{0x2420000, "PowerShot A470"}, {0x02420000, "PowerShot A470"},
{0x2430000, "PowerShot SD1100 IS / Digital IXUS 80 IS / IXY Digital 20 IS"}, {0x02430000, "PowerShot SD1100 IS / Digital IXUS 80 IS / IXY Digital 20 IS"},
{0x2460000, "PowerShot SX1 IS"}, {0x02460000, "PowerShot SX1 IS"},
{0x2470000, "PowerShot SX10 IS"}, {0x02470000, "PowerShot SX10 IS"},
{0x2480000, "PowerShot A1000 IS"}, {0x02480000, "PowerShot A1000 IS"},
{0x2490000, "PowerShot G10"}, {0x02490000, "PowerShot G10"},
{0x2510000, "PowerShot A2000 IS"}, {0x02510000, "PowerShot A2000 IS"},
{0x2520000, "PowerShot SX110 IS"}, {0x02520000, "PowerShot SX110 IS"},
{0x2530000, "PowerShot SD990 IS / Digital IXUS 980 IS / IXY Digital 3000 IS"}, {0x02530000, "PowerShot SD990 IS / Digital IXUS 980 IS / IXY Digital 3000 IS"},
{0x2540000, "PowerShot SD880 IS / Digital IXUS 870 IS / IXY Digital 920 IS"}, {0x02540000, "PowerShot SD880 IS / Digital IXUS 870 IS / IXY Digital 920 IS"},
{0x2550000, "PowerShot E1"}, {0x02550000, "PowerShot E1"},
{0x2560000, "PowerShot D10"}, {0x02560000, "PowerShot D10"},
{0x2570000, "PowerShot SD960 IS / Digital IXUS 110 IS / IXY Digital 510 IS"}, {0x02570000, "PowerShot SD960 IS / Digital IXUS 110 IS / IXY Digital 510 IS"},
{0x2580000, "PowerShot A2100 IS"}, {0x02580000, "PowerShot A2100 IS"},
{0x2590000, "PowerShot A480"}, {0x02590000, "PowerShot A480"},
{0x2600000, "PowerShot SX200 IS"}, {0x02600000, "PowerShot SX200 IS"},
{0x2610000, "PowerShot SD970 IS / Digital IXUS 990 IS / IXY Digital 830 IS"}, {0x02610000, "PowerShot SD970 IS / Digital IXUS 990 IS / IXY Digital 830 IS"},
{0x2620000, "PowerShot SD780 IS / Digital IXUS 100 IS / IXY Digital 210 IS"}, {0x02620000, "PowerShot SD780 IS / Digital IXUS 100 IS / IXY Digital 210 IS"},
{0x2630000, "PowerShot A1100 IS"}, {0x02630000, "PowerShot A1100 IS"},
{0x2640000, "PowerShot SD1200 IS / Digital IXUS 95 IS / IXY Digital 110 IS"}, {0x02640000, "PowerShot SD1200 IS / Digital IXUS 95 IS / IXY Digital 110 IS"},
{0x2700000, "PowerShot G11"}, {0x02700000, "PowerShot G11"},
{0x2710000, "PowerShot SX120 IS"}, {0x02710000, "PowerShot SX120 IS"},
{0x2720000, "PowerShot S90"}, {0x02720000, "PowerShot S90"},
{0x2750000, "PowerShot SX20 IS"}, {0x02750000, "PowerShot SX20 IS"},
{0x2760000, "PowerShot SD980 IS / Digital IXUS 200 IS / IXY Digital 930 IS"}, {0x02760000, "PowerShot SD980 IS / Digital IXUS 200 IS / IXY Digital 930 IS"},
{0x2770000, "PowerShot SD940 IS / Digital IXUS 120 IS / IXY Digital 220 IS"}, {0x02770000, "PowerShot SD940 IS / Digital IXUS 120 IS / IXY Digital 220 IS"},
{0x2800000, "PowerShot A495"}, {0x02800000, "PowerShot A495"},
{0x2810000, "PowerShot A490"}, {0x02810000, "PowerShot A490"},
{0x2820000, "PowerShot A3100/A3150 IS"}, {0x02820000, "PowerShot A3100/A3150 IS"},
{0x2830000, "PowerShot A3000 IS"}, {0x02830000, "PowerShot A3000 IS"},
{0x2840000, "PowerShot SD1400 IS / IXUS 130 / IXY 400F"}, {0x02840000, "PowerShot SD1400 IS / IXUS 130 / IXY 400F"},
{0x2850000, "PowerShot SD1300 IS / IXUS 105 / IXY 200F"}, {0x02850000, "PowerShot SD1300 IS / IXUS 105 / IXY 200F"},
{0x2860000, "PowerShot SD3500 IS / IXUS 210 / IXY 10S"}, {0x02860000, "PowerShot SD3500 IS / IXUS 210 / IXY 10S"},
{0x2870000, "PowerShot SX210 IS"}, {0x02870000, "PowerShot SX210 IS"},
{0x2880000, "PowerShot SD4000 IS / IXUS 300 HS / IXY 30S"}, {0x02880000, "PowerShot SD4000 IS / IXUS 300 HS / IXY 30S"},
{0x2890000, "PowerShot SD4500 IS / IXUS 1000 HS / IXY 50S"}, {0x02890000, "PowerShot SD4500 IS / IXUS 1000 HS / IXY 50S"},
{0x2920000, "PowerShot G12"}, {0x02920000, "PowerShot G12"},
{0x2930000, "PowerShot SX30 IS"}, {0x02930000, "PowerShot SX30 IS"},
{0x2940000, "PowerShot SX130 IS"}, {0x02940000, "PowerShot SX130 IS"},
{0x2950000, "PowerShot S95"}, {0x02950000, "PowerShot S95"},
{0x2980000, "PowerShot A3300 IS"}, {0x02980000, "PowerShot A3300 IS"},
{0x2990000, "PowerShot A3200 IS"}, {0x02990000, "PowerShot A3200 IS"},
{0x3000000, "PowerShot ELPH 500 HS / IXUS 310 HS / IXY 31S"}, {0x03000000, "PowerShot ELPH 500 HS / IXUS 310 HS / IXY 31S"},
{0x3010000, "PowerShot Pro90 IS"}, {0x03010000, "PowerShot Pro90 IS"},
{0x3010001, "PowerShot A800"}, {0x03010001, "PowerShot A800"},
{0x3020000, "PowerShot ELPH 100 HS / IXUS 115 HS / IXY 210F"}, {0x03020000, "PowerShot ELPH 100 HS / IXUS 115 HS / IXY 210F"},
{0x3030000, "PowerShot SX230 HS"}, {0x03030000, "PowerShot SX230 HS"},
{0x3040000, "PowerShot ELPH 300 HS / IXUS 220 HS / IXY 410F"}, {0x03040000, "PowerShot ELPH 300 HS / IXUS 220 HS / IXY 410F"},
{0x3050000, "PowerShot A2200"}, {0x03050000, "PowerShot A2200"},
{0x3060000, "PowerShot A1200"}, {0x03060000, "PowerShot A1200"},
{0x3070000, "PowerShot SX220 HS"}, {0x03070000, "PowerShot SX220 HS"},
{0x3080000, "PowerShot G1 X"}, {0x03080000, "PowerShot G1 X"},
{0x3090000, "PowerShot SX150 IS"}, {0x03090000, "PowerShot SX150 IS"},
{0x3100000, "PowerShot ELPH 510 HS / IXUS 1100 HS / IXY 51S"}, {0x03100000, "PowerShot ELPH 510 HS / IXUS 1100 HS / IXY 51S"},
{0x3110000, "PowerShot S100 (new)"}, {0x03110000, "PowerShot S100 (new)"},
{0x3130000, "PowerShot SX40 HS"}, {0x03120000, "PowerShot ELPH 310 HS / IXUS 230 HS / IXY 600F"},
{0x3120000, "PowerShot ELPH 310 HS / IXUS 230 HS / IXY 600F"}, {0x03130000, "PowerShot SX40 HS"},
{0x3140000, "IXY 32S"}, {0x03140000, "IXY 32S"},
{0x3160000, "PowerShot A1300"}, {0x03160000, "PowerShot A1300"},
{0x3170000, "PowerShot A810"}, {0x03170000, "PowerShot A810"},
{0x3180000, "PowerShot ELPH 320 HS / IXUS 240 HS / IXY 420F"}, {0x03180000, "PowerShot ELPH 320 HS / IXUS 240 HS / IXY 420F"},
{0x3190000, "PowerShot ELPH 110 HS / IXUS 125 HS / IXY 220F"}, {0x03190000, "PowerShot ELPH 110 HS / IXUS 125 HS / IXY 220F"},
{0x3200000, "PowerShot D20"}, {0x03200000, "PowerShot D20"},
{0x3210000, "PowerShot A4000 IS"}, {0x03210000, "PowerShot A4000 IS"},
{0x3220000, "PowerShot SX260 HS"}, {0x03220000, "PowerShot SX260 HS"},
{0x3230000, "PowerShot SX240 HS"}, {0x03230000, "PowerShot SX240 HS"},
{0x3240000, "PowerShot ELPH 530 HS / IXUS 510 HS / IXY 1"}, {0x03240000, "PowerShot ELPH 530 HS / IXUS 510 HS / IXY 1"},
{0x3250000, "PowerShot ELPH 520 HS / IXUS 500 HS / IXY 3"}, {0x03250000, "PowerShot ELPH 520 HS / IXUS 500 HS / IXY 3"},
{0x3260000, "PowerShot A3400 IS"}, {0x03260000, "PowerShot A3400 IS"},
{0x3270000, "PowerShot A2400 IS"}, {0x03270000, "PowerShot A2400 IS"},
{0x3280000, "PowerShot A2300"}, {0x03280000, "PowerShot A2300"},
{0x3320000, "PowerShot S100V"}, {0x03320000, "PowerShot S100V"},
{0x3330000, "PowerShot G15"}, {0x03330000, "PowerShot G15"},
{0x3340000, "PowerShot SX50 HS"}, {0x03340000, "PowerShot SX50 HS"},
{0x3350000, "PowerShot SX160 IS"}, {0x03350000, "PowerShot SX160 IS"},
{0x3360000, "PowerShot S110 (new)"}, {0x03360000, "PowerShot S110 (new)"},
{0x3370000, "PowerShot SX500 IS"}, {0x03370000, "PowerShot SX500 IS"},
{0x3380000, "PowerShot N"}, {0x03380000, "PowerShot N"},
{0x3390000, "IXUS 245 HS / IXY 430F"}, {0x03390000, "IXUS 245 HS / IXY 430F"},
{0x3400000, "PowerShot SX280 HS"}, {0x03400000, "PowerShot SX280 HS"},
{0x3410000, "PowerShot SX270 HS"}, {0x03410000, "PowerShot SX270 HS"},
{0x3420000, "PowerShot A3500 IS"}, {0x03420000, "PowerShot A3500 IS"},
{0x3430000, "PowerShot A2600"}, {0x03430000, "PowerShot A2600"},
{0x3440000, "PowerShot SX275 HS"}, {0x03440000, "PowerShot SX275 HS"},
{0x3450000, "PowerShot A1400"}, {0x03450000, "PowerShot A1400"},
{0x3460000, "PowerShot ELPH 130 IS / IXUS 140 / IXY 110F"}, {0x03460000, "PowerShot ELPH 130 IS / IXUS 140 / IXY 110F"},
{0x3470000, "PowerShot ELPH 115/120 IS / IXUS 132/135 / IXY 90F/100F"}, {0x03470000, "PowerShot ELPH 115/120 IS / IXUS 132/135 / IXY 90F/100F"},
{0x3490000, "PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F"}, {0x03490000, "PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F"},
{0x3510000, "PowerShot A2500"}, {0x03510000, "PowerShot A2500"},
{0x3540000, "PowerShot G16"}, {0x03540000, "PowerShot G16"},
{0x3550000, "PowerShot S120"}, {0x03550000, "PowerShot S120"},
{0x3560000, "PowerShot SX170 IS"}, {0x03560000, "PowerShot SX170 IS"},
{0x3580000, "PowerShot SX510 HS"}, {0x03580000, "PowerShot SX510 HS"},
{0x3590000, "PowerShot S200 (new)"}, {0x03590000, "PowerShot S200 (new)"},
{0x3600000, "IXY 620F"}, {0x03600000, "IXY 620F"},
{0x3610000, "PowerShot N100"}, {0x03610000, "PowerShot N100"},
{0x3640000, "PowerShot G1 X Mark II"}, {0x03640000, "PowerShot G1 X Mark II"},
{0x3650000, "PowerShot D30"}, {0x03650000, "PowerShot D30"},
{0x3660000, "PowerShot SX700 HS"}, {0x03660000, "PowerShot SX700 HS"},
{0x3670000, "PowerShot SX600 HS"}, {0x03670000, "PowerShot SX600 HS"},
{0x3680000, "PowerShot ELPH 140 IS / IXUS 150 / IXY 130"}, {0x03680000, "PowerShot ELPH 140 IS / IXUS 150 / IXY 130"},
{0x3690000, "PowerShot ELPH 135 / IXUS 145 / IXY 120"}, {0x03690000, "PowerShot ELPH 135 / IXUS 145 / IXY 120"},
{0x3700000, "PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630"}, {0x03700000, "PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630"},
{0x3710000, "PowerShot ELPH 150 IS / IXUS 155 / IXY 140"}, {0x03710000, "PowerShot ELPH 150 IS / IXUS 155 / IXY 140"},
{0x3740000, "EOS M3"}, {0x03740000, "EOS M3"},
{0x3750000, "PowerShot SX60 HS"}, {0x03750000, "PowerShot SX60 HS"},
{0x3760000, "PowerShot SX520 HS"}, {0x03760000, "PowerShot SX520 HS"},
{0x3770000, "PowerShot SX400 IS"}, {0x03770000, "PowerShot SX400 IS"},
{0x3780000, "PowerShot G7 X"}, {0x03780000, "PowerShot G7 X"},
{0x3790000, "PowerShot N2"}, {0x03790000, "PowerShot N2"},
{0x3800000, "PowerShot SX530 HS"}, {0x03800000, "PowerShot SX530 HS"},
{0x3820000, "PowerShot SX710 HS"}, {0x03820000, "PowerShot SX710 HS"},
{0x3830000, "PowerShot SX610 HS"}, {0x03830000, "PowerShot SX610 HS"},
{0x3840000, "EOS M10"}, {0x03840000, "EOS M10"},
{0x3850000, "PowerShot G3 X"}, {0x03850000, "PowerShot G3 X"},
{0x3860000, "PowerShot ELPH 165 HS / IXUS 165 / IXY 160"}, {0x03860000, "PowerShot ELPH 165 HS / IXUS 165 / IXY 160"},
{0x3870000, "PowerShot ELPH 160 / IXUS 160"}, {0x03870000, "PowerShot ELPH 160 / IXUS 160"},
{0x3880000, "PowerShot ELPH 350 HS / IXUS 275 HS / IXY 640"}, {0x03880000, "PowerShot ELPH 350 HS / IXUS 275 HS / IXY 640"},
{0x3890000, "PowerShot ELPH 170 IS / IXUS 170"}, {0x03890000, "PowerShot ELPH 170 IS / IXUS 170"},
{0x3910000, "PowerShot SX410 IS"}, {0x03910000, "PowerShot SX410 IS"},
{0x3930000, "PowerShot G9 X"}, {0x03930000, "PowerShot G9 X"},
{0x3940000, "EOS M5"}, {0x03940000, "EOS M5"},
{0x3950000, "PowerShot G5 X"}, {0x03950000, "PowerShot G5 X"},
{0x3970000, "PowerShot G7 X Mark II"}, {0x03970000, "PowerShot G7 X Mark II"},
{0x3980000, "EOS M100"}, {0x03980000, "EOS M100"},
{0x3990000, "PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650"}, {0x03990000, "PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650"},
{0x4010000, "PowerShot SX540 HS"}, {0x04010000, "PowerShot SX540 HS"},
{0x4020000, "PowerShot SX420 IS"}, {0x04020000, "PowerShot SX420 IS"},
{0x4030000, "PowerShot ELPH 190 IS / IXUS 180 / IXY 190"}, {0x04030000, "PowerShot ELPH 190 IS / IXUS 180 / IXY 190"},
{0x4040000, "PowerShot G1"}, {0x04040000, "PowerShot G1"},
{0x4040001, "PowerShot ELPH 180 IS / IXUS 175 / IXY 180"}, {0x04040001, "PowerShot ELPH 180 IS / IXUS 175 / IXY 180"},
{0x4050000, "PowerShot SX720 HS"}, {0x04050000, "PowerShot SX720 HS"},
{0x4060000, "PowerShot SX620 HS"}, {0x04060000, "PowerShot SX620 HS"},
{0x4070000, "EOS M6"}, {0x04070000, "EOS M6"},
{0x4100000, "PowerShot G9 X Mark II"}, {0x04100000, "PowerShot G9 X Mark II"},
{0x412, "EOS M50 / Kiss M"}, {0x04150000, "PowerShot ELPH 185 / IXUS 185 / IXY 200"},
{0x4150000, "PowerShot ELPH 185 / IXUS 185 / IXY 200"}, {0x04160000, "PowerShot SX430 IS"},
{0x4160000, "PowerShot SX430 IS"}, {0x04170000, "PowerShot SX730 HS"},
{0x4170000, "PowerShot SX730 HS"}, {0x04180000, "PowerShot G1 X Mark III"},
{0x4180000, "PowerShot G1 X Mark III"}, {0x06040000, "PowerShot S100 / Digital IXUS / IXY Digital"},
{0x6040000, "PowerShot S100 / Digital IXUS / IXY Digital"},
{0x801, "PowerShot SX740 HS"},
{0x4007d673, "DC19/DC21/DC22"}, {0x4007d673, "DC19/DC21/DC22"},
{0x4007d674, "XH A1"}, {0x4007d674, "XH A1"},
{0x4007d675, "HV10"}, {0x4007d675, "HV10"},
@ -351,11 +351,11 @@ constexpr TagDetails canonModelId[] = {{0x00000811, "EOS M6 Mark II"},
{0x80000327, "EOS Rebel T5 / 1200D / Kiss X70 / Hi"}, {0x80000327, "EOS Rebel T5 / 1200D / Kiss X70 / Hi"},
{0x80000328, "EOS-1D X Mark II"}, {0x80000328, "EOS-1D X Mark II"},
{0x80000331, "EOS M"}, {0x80000331, "EOS M"},
{0x80000350, "EOS 80D"},
{0x80000355, "EOS M2"},
{0x80000346, "EOS Rebel SL1 / 100D / Kiss X7"}, {0x80000346, "EOS Rebel SL1 / 100D / Kiss X7"},
{0x80000347, "EOS Rebel T6s / 760D / 8000D"}, {0x80000347, "EOS Rebel T6s / 760D / 8000D"},
{0x80000349, "EOS 5D Mark IV"}, {0x80000349, "EOS 5D Mark IV"},
{0x80000350, "EOS 80D"},
{0x80000355, "EOS M2"},
{0x80000382, "EOS 5DS"}, {0x80000382, "EOS 5DS"},
{0x80000393, "EOS Rebel T6i / 750D / Kiss X8i"}, {0x80000393, "EOS Rebel T6i / 750D / Kiss X8i"},
{0x80000401, "EOS 5DS R"}, {0x80000401, "EOS 5DS R"},
@ -370,7 +370,7 @@ constexpr TagDetails canonModelId[] = {{0x00000811, "EOS M6 Mark II"},
{0x80000428, "EOS-1D X Mark III"}, {0x80000428, "EOS-1D X Mark III"},
{0x80000432, "EOS Rebel T7 / 2000D / 1500D / Kiss X90"}, {0x80000432, "EOS Rebel T7 / 2000D / 1500D / Kiss X90"},
{0x80000433, "EOS RP"}, {0x80000433, "EOS RP"},
{0x80000435, "EOS 850D / EOS Rebel T8i / Kiss X10i"}, {0x80000435, "EOS Rebel T8i / 850D / Kiss X10i"},
{0x80000436, "EOS SL3 / 250D / Kiss X10"}, {0x80000436, "EOS SL3 / 250D / Kiss X10"},
{0x80000437, "EOS 90D"}, {0x80000437, "EOS 90D"},
{0x80000450, "EOS R3"}, {0x80000450, "EOS R3"},
@ -379,7 +379,7 @@ constexpr TagDetails canonModelId[] = {{0x00000811, "EOS M6 Mark II"},
{0x80000465, "EOS R10"}, {0x80000465, "EOS R10"},
{0x80000467, "PowerShot ZOOM"}, {0x80000467, "PowerShot ZOOM"},
{0x80000468, "EOS M50 Mark II / Kiss M2"}, {0x80000468, "EOS M50 Mark II / Kiss M2"},
//{ (long int)tbd, "EOS M50 Mark II" }, //{ (long int)tbd, "EOS Ra" },
{0x80000520, "EOS D2000C"}, {0x80000520, "EOS D2000C"},
{0x80000560, "EOS D6000C"}}; {0x80000560, "EOS D6000C"}};
@ -1931,16 +1931,27 @@ constexpr TagDetails canonCsLensType[] = {{1, "Canon EF 50mm f/1.8"},
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x"}, {61182, "Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x"},
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM + RF2x"}, {61182, "Canon RF 100-500mm F4.5-7.1L IS USM + RF2x"},
{61182, "Canon RF 70-200mm F4L IS USM"}, {61182, "Canon RF 70-200mm F4L IS USM"},
{61182, "Canon RF 100mm F2.8L MACRO IS USM"},
{61182, "Canon RF 50mm F1.8 STM"}, {61182, "Canon RF 50mm F1.8 STM"},
{61182, "Canon RF 14-35mm F4L IS USM"}, {61182, "Canon RF 14-35mm F4L IS USM"},
{61182, "Canon RF-S 18-45mm F4.5-6.3 IS STM"},
{61182, "Canon RF 100-400mm F5.6-8 IS USM"}, {61182, "Canon RF 100-400mm F5.6-8 IS USM"},
{61182, "Canon RF 100-400mm F5.6-8 IS USM + RF1.4x"}, {61182, "Canon RF 100-400mm F5.6-8 IS USM + RF1.4x"},
{61182, "Canon RF 100-400mm F5.6-8 IS USM + RF2x"}, {61182, "Canon RF 100-400mm F5.6-8 IS USM + RF2x"},
{61182, "Canon RF-S 18-150mm F3.5-6.3 IS STM"},
{61182, "Canon RF 24mm F1.8 MACRO IS STM"},
{61182, "Canon RF 16mm F2.8 STM"}, {61182, "Canon RF 16mm F2.8 STM"},
{61182, "Canon RF 400mm F2.8L IS USM"}, {61182, "Canon RF 400mm F2.8L IS USM"},
{61182, "Canon RF 400mm F2.8L IS USM + RF1.4x"}, {61182, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
{61182, "Canon RF 400mm F2.8L IS USM + RF2x"}, {61182, "Canon RF 400mm F2.8L IS USM + RF2x"},
{61182, "Canon RF 600mm F4L IS USM"}, {61182, "Canon RF 600mm F4L IS USM"},
{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"},
{61182, "Canon RF 1200mm F8L IS USM"},
{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"},
{65535, "n/a"}}; {65535, "n/a"}};
//! FlashActivity, tag 0x001c //! FlashActivity, tag 0x001c
@ -2309,6 +2320,7 @@ constexpr TagDetails canonToningEffect[] = {
{0, N_("None")}, {1, N_("Sepia")}, {2, N_("Blue")}, {3, N_("Purple")}, {4, N_("Green")}}; {0, N_("None")}, {1, N_("Sepia")}, {2, N_("Blue")}, {3, N_("Purple")}, {4, N_("Green")}};
//! RFLensType, tag 0x003D //! RFLensType, tag 0x003D
// from https://github.com/exiftool/exiftool/blob/12.49/lib/Image/ExifTool/Canon.pm#L6791
constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")}, constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")},
{257, "Canon RF 50mm F1.2L USM"}, {257, "Canon RF 50mm F1.2L USM"},
{258, "Canon RF 24-105mm F4L IS USM"}, {258, "Canon RF 24-105mm F4L IS USM"},
@ -2332,16 +2344,27 @@ constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")},
{276, "Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x"}, {276, "Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x"},
{277, "Canon RF 100-500mm F4.5-7.1L IS USM + RF2x"}, {277, "Canon RF 100-500mm F4.5-7.1L IS USM + RF2x"},
{278, "Canon RF 70-200mm F4L IS USM"}, {278, "Canon RF 70-200mm F4L IS USM"},
{279, "Canon RF 100mm F2.8L MACRO IS USM"},
{280, "Canon RF 50mm F1.8 STM"}, {280, "Canon RF 50mm F1.8 STM"},
{281, "Canon RF 14-35mm F4L IS USM"}, {281, "Canon RF 14-35mm F4L IS USM"},
{282, "Canon RF-S 18-45mm F4.5-6.3 IS STM"},
{283, "Canon RF 100-400mm F5.6-8 IS USM"}, {283, "Canon RF 100-400mm F5.6-8 IS USM"},
{284, "Canon RF 100-400mm F5.6-8 IS USM + RF1.4x"}, {284, "Canon RF 100-400mm F5.6-8 IS USM + RF1.4x"},
{285, "Canon RF 100-400mm F5.6-8 IS USM + RF2x"}, {285, "Canon RF 100-400mm F5.6-8 IS USM + RF2x"},
{286, "Canon RF-S 18-150mm F3.5-6.3 IS STM"},
{287, "Canon RF 24mm F1.8 MACRO IS STM"},
{288, "Canon RF 16mm F2.8 STM"}, {288, "Canon RF 16mm F2.8 STM"},
{289, "Canon RF 400mm F2.8L IS USM"}, {289, "Canon RF 400mm F2.8L IS USM"},
{290, "Canon RF 400mm F2.8L IS USM + RF1.4x"}, {290, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
{291, "Canon RF 400mm F2.8L IS USM + RF2x"}, {291, "Canon RF 400mm F2.8L IS USM + RF2x"},
{292, "Canon RF 600mm F4L IS USM"}}; {292, "Canon RF 600mm F4L IS USM"},
{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"},
{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"}};
// Canon File Info Tag // Canon File Info Tag
constexpr TagInfo CanonMakerNote::tagInfoFi_[] = { constexpr TagInfo CanonMakerNote::tagInfoFi_[] = {

Write Preview
Loading…
Cancel
Save