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

#1025. Thank You Thomas for the patch.

Browse Source
v0.27.3
Robin Mills 11 years ago
parent 6617bf1e19
commit 94e62b331c
6 changed files with 748 additions and 748 deletions
Show Stats Download Patch File Download Diff File

554
src/canonmn.cpp
Unescape Escape View File

@ -69,283 +69,283 @@ namespace Exiv2 {
//! ModelId, tag 0x0010
extern const TagDetails canonModelId[] = {
{ (long int)0x1010000, N_("PowerShot A30") },
{ (long int)0x1040000, N_("PowerShot S300 / Digital IXUS 300 / IXY Digital 300") },
{ (long int)0x1060000, N_("PowerShot A20") },
{ (long int)0x1080000, N_("PowerShot A10") },
{ (long int)0x1090000, N_("PowerShot S110 / Digital IXUS v / IXY Digital 200") },
{ (long int)0x1100000, N_("PowerShot G2") },
{ (long int)0x1110000, N_("PowerShot S40") },
{ (long int)0x1120000, N_("PowerShot S30") },
{ (long int)0x1130000, N_("PowerShot A40") },
{ (long int)0x1140000, N_("EOS D30") },
{ (long int)0x1150000, N_("PowerShot A100") },
{ (long int)0x1160000, N_("PowerShot S200 / Digital IXUS v2 / IXY Digital 200a") },
{ (long int)0x1170000, N_("PowerShot A200") },
{ (long int)0x1180000, N_("PowerShot S330 / Digital IXUS 330 / IXY Digital 300a") },
{ (long int)0x1190000, N_("PowerShot G3") },
{ (long int)0x1210000, N_("PowerShot S45") },
{ (long int)0x1230000, N_("PowerShot SD100 / Digital IXUS II / IXY Digital 30") },
{ (long int)0x1240000, N_("PowerShot S230 / Digital IXUS v3 / IXY Digital 320") },
{ (long int)0x1250000, N_("PowerShot A70") },
{ (long int)0x1260000, N_("PowerShot A60") },
{ (long int)0x1270000, N_("PowerShot S400 / Digital IXUS 400 / IXY Digital 400") },
{ (long int)0x1290000, N_("PowerShot G5") },
{ (long int)0x1300000, N_("PowerShot A300") },
{ (long int)0x1310000, N_("PowerShot S50") },
{ (long int)0x1340000, N_("PowerShot A80") },
{ (long int)0x1350000, N_("PowerShot SD10 / Digital IXUS i / IXY Digital L") },
{ (long int)0x1360000, N_("PowerShot S1 IS") },
{ (long int)0x1370000, N_("PowerShot Pro1") },
{ (long int)0x1380000, N_("PowerShot S70") },
{ (long int)0x1390000, N_("PowerShot S60") },
{ (long int)0x1400000, N_("PowerShot G6") },
{ (long int)0x1410000, N_("PowerShot S500 / Digital IXUS 500 / IXY Digital 500") },
{ (long int)0x1420000, N_("PowerShot A75") },
{ (long int)0x1440000, N_("PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a") },
{ (long int)0x1450000, N_("PowerShot A400") },
{ (long int)0x1470000, N_("PowerShot A310") },
{ (long int)0x1490000, N_("PowerShot A85") },
{ (long int)0x1520000, N_("PowerShot S410 / Digital IXUS 430 / IXY Digital 450") },
{ (long int)0x1530000, N_("PowerShot A95") },
{ (long int)0x1540000, N_("PowerShot SD300 / Digital IXUS 40 / IXY Digital 50") },
{ (long int)0x1550000, N_("PowerShot SD200 / Digital IXUS 30 / IXY Digital 40") },
{ (long int)0x1560000, N_("PowerShot A520") },
{ (long int)0x1570000, N_("PowerShot A510") },
{ (long int)0x1590000, N_("PowerShot SD20 / Digital IXUS i5 / IXY Digital L2") },
{ (long int)0x1640000, N_("PowerShot S2 IS") },
{ (long int)0x1650000, N_("PowerShot SD430 / IXUS Wireless / IXY Wireless") },
{ (long int)0x1660000, N_("PowerShot SD500 / Digital IXUS 700 / IXY Digital 600") },
{ (long int)0x1668000, N_("EOS D60") },
{ (long int)0x1700000, N_("PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3") },
{ (long int)0x1740000, N_("PowerShot A430") },
{ (long int)0x1750000, N_("PowerShot A410") },
{ (long int)0x1760000, N_("PowerShot S80") },
{ (long int)0x1780000, N_("PowerShot A620") },
{ (long int)0x1790000, N_("PowerShot A610") },
{ (long int)0x1800000, N_("PowerShot SD630 / Digital IXUS 65 / IXY Digital 80") },
{ (long int)0x1810000, N_("PowerShot SD450 / Digital IXUS 55 / IXY Digital 60") },
{ (long int)0x1820000, N_("PowerShot TX1") },
{ (long int)0x1870000, N_("PowerShot SD400 / Digital IXUS 50 / IXY Digital 55") },
{ (long int)0x1880000, N_("PowerShot A420") },
{ (long int)0x1890000, N_("PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000") },
{ (long int)0x1900000, N_("PowerShot SD550 / Digital IXUS 750 / IXY Digital 700") },
{ (long int)0x1920000, N_("PowerShot A700") },
{ (long int)0x1940000, N_("PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS") },
{ (long int)0x1950000, N_("PowerShot S3 IS") },
{ (long int)0x1960000, N_("PowerShot A540") },
{ (long int)0x1970000, N_("PowerShot SD600 / Digital IXUS 60 / IXY Digital 70") },
{ (long int)0x1980000, N_("PowerShot G7") },
{ (long int)0x1990000, N_("PowerShot A530") },
{ (long int)0x2000000, N_("PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS") },
{ (long int)0x2010000, N_("PowerShot SD40 / Digital IXUS i7 / IXY Digital L4") },
{ (long int)0x2020000, N_("PowerShot A710 IS") },
{ (long int)0x2030000, N_("PowerShot A640") },
{ (long int)0x2040000, N_("PowerShot A630") },
{ (long int)0x2090000, N_("PowerShot S5 IS") },
{ (long int)0x2100000, N_("PowerShot A460") },
{ (long int)0x2120000, N_("PowerShot SD850 IS / Digital IXUS 950 IS") },
{ (long int)0x2130000, N_("PowerShot A570 IS") },
{ (long int)0x2140000, N_("PowerShot A560") },
{ (long int)0x2150000, N_("PowerShot SD750 / Digital IXUS 75 / IXY Digital 90") },
{ (long int)0x2160000, N_("PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10") },
{ (long int)0x2180000, N_("PowerShot A550") },
{ (long int)0x2190000, N_("PowerShot A450") },
{ (long int)0x2230000, N_("PowerShot G9") },
{ (long int)0x2240000, N_("PowerShot A650 IS") },
{ (long int)0x2260000, N_("PowerShot A720 IS") },
{ (long int)0x2290000, N_("PowerShot SX100 IS") },
{ (long int)0x2300000, N_("PowerShot SD950 IS / Digital IXUS 960 IS / IXY Digital 2000 IS") },
{ (long int)0x2310000, N_("PowerShot SD870 IS / Digital IXUS 860 IS / IXY Digital 910 IS") },
{ (long int)0x2320000, N_("PowerShot SD890 IS / Digital IXUS 970 IS / IXY Digital 820 IS") },
{ (long int)0x2360000, N_("PowerShot SD790 IS / Digital IXUS 90 IS / IXY Digital 95 IS") },
{ (long int)0x2370000, N_("PowerShot SD770 IS / Digital IXUS 85 IS / IXY Digital 25 IS") },
{ (long int)0x2380000, N_("PowerShot A590 IS") },
{ (long int)0x2390000, N_("PowerShot A580") },
{ (long int)0x2420000, N_("PowerShot A470") },
{ (long int)0x2430000, N_("PowerShot SD1100 IS / Digital IXUS 80 IS / IXY Digital 20 IS") },
{ (long int)0x2460000, N_("PowerShot SX1 IS") },
{ (long int)0x2470000, N_("PowerShot SX10 IS") },
{ (long int)0x2480000, N_("PowerShot A1000 IS") },
{ (long int)0x2490000, N_("PowerShot G10") },
{ (long int)0x2510000, N_("PowerShot A2000 IS") },
{ (long int)0x2520000, N_("PowerShot SX110 IS") },
{ (long int)0x2530000, N_("PowerShot SD990 IS / Digital IXUS 980 IS / IXY Digital 3000 IS") },
{ (long int)0x2540000, N_("PowerShot SD880 IS / Digital IXUS 870 IS / IXY Digital 920 IS") },
{ (long int)0x2550000, N_("PowerShot E1") },
{ (long int)0x2560000, N_("PowerShot D10") },
{ (long int)0x2570000, N_("PowerShot SD960 IS / Digital IXUS 110 IS / IXY Digital 510 IS") },
{ (long int)0x2580000, N_("PowerShot A2100 IS") },
{ (long int)0x2590000, N_("PowerShot A480") },
{ (long int)0x2600000, N_("PowerShot SX200 IS") },
{ (long int)0x2610000, N_("PowerShot SD970 IS / Digital IXUS 990 IS / IXY Digital 830 IS") },
{ (long int)0x2620000, N_("PowerShot SD780 IS / Digital IXUS 100 IS / IXY Digital 210 IS") },
{ (long int)0x2630000, N_("PowerShot A1100 IS") },
{ (long int)0x2640000, N_("PowerShot SD1200 IS / Digital IXUS 95 IS / IXY Digital 110 IS") },
{ (long int)0x2700000, N_("PowerShot G11") },
{ (long int)0x2710000, N_("PowerShot SX120 IS") },
{ (long int)0x2720000, N_("PowerShot S90") },
{ (long int)0x2750000, N_("PowerShot SX20 IS") },
{ (long int)0x2760000, N_("PowerShot SD980 IS / Digital IXUS 200 IS / IXY Digital 930 IS") },
{ (long int)0x2770000, N_("PowerShot SD940 IS / Digital IXUS 120 IS / IXY Digital 220 IS") },
{ (long int)0x2800000, N_("PowerShot A495") },
{ (long int)0x2810000, N_("PowerShot A490") },
{ (long int)0x2820000, N_("PowerShot A3100 IS / A3150 IS") },
{ (long int)0x2830000, N_("PowerShot A3000 IS") },
{ (long int)0x2840000, N_("PowerShot SD1400 IS / IXUS 130 / IXY 400F") },
{ (long int)0x2850000, N_("PowerShot SD1300 IS / IXUS 105 / IXY 200F") },
{ (long int)0x2860000, N_("PowerShot SD3500 IS / IXUS 210 / IXY 10S") },
{ (long int)0x2870000, N_("PowerShot SX210 IS") },
{ (long int)0x2880000, N_("PowerShot SD4000 IS / IXUS 300 HS / IXY 30S") },
{ (long int)0x2890000, N_("PowerShot SD4500 IS / IXUS 1000 HS / IXY 50S") },
{ (long int)0x2920000, N_("PowerShot G12") },
{ (long int)0x2930000, N_("PowerShot SX30 IS") },
{ (long int)0x2940000, N_("PowerShot SX130 IS") },
{ (long int)0x2950000, N_("PowerShot S95") },
{ (long int)0x2980000, N_("PowerShot A3300 IS") },
{ (long int)0x2990000, N_("PowerShot A3200 IS") },
{ (long int)0x3000000, N_("PowerShot ELPH 500 HS / IXUS 310 HS / IXY 31S") },
{ (long int)0x3010000, N_("PowerShot Pro90 IS") },
{ (long int)0x3010001, N_("PowerShot A800") },
{ (long int)0x3020000, N_("PowerShot ELPH 100 HS / IXUS 115 HS / IXY 210F") },
{ (long int)0x3030000, N_("PowerShot SX230 HS") },
{ (long int)0x3040000, N_("PowerShot ELPH 300 HS / IXUS 220 HS / IXY 410F") },
{ (long int)0x3050000, N_("PowerShot A2200") },
{ (long int)0x3060000, N_("PowerShot A1200") },
{ (long int)0x3070000, N_("PowerShot SX220 HS") },
{ (long int)0x3080000, N_("PowerShot G1 X") },
{ (long int)0x3090000, N_("PowerShot SX150 IS") },
{ (long int)0x3100000, N_("PowerShot ELPH 510 HS / IXUS 1100 HS / IXY 51S") },
{ (long int)0x3110000, N_("PowerShot S100 (new)") },
{ (long int)0x3130000, N_("PowerShot SX40 HS") },
{ (long int)0x3120000, N_("PowerShot ELPH 310 HS / IXUS 230 HS / IXY 600F") },
{ (long int)0x3140000, N_("IXY 32S") },
{ (long int)0x3160000, N_("PowerShot A1300") },
{ (long int)0x3170000, N_("PowerShot A810") },
{ (long int)0x3180000, N_("PowerShot ELPH 320 HS / IXUS 240 HS / IXY 420F") },
{ (long int)0x3190000, N_("PowerShot ELPH 110 HS / IXUS 125 HS / IXY 220F") },
{ (long int)0x3200000, N_("PowerShot D20") },
{ (long int)0x3210000, N_("PowerShot A4000 IS") },
{ (long int)0x3220000, N_("PowerShot SX260 HS") },
{ (long int)0x3230000, N_("PowerShot SX240 HS") },
{ (long int)0x3240000, N_("PowerShot ELPH 530 HS / IXUS 510 HS / IXY 1") },
{ (long int)0x3250000, N_("PowerShot ELPH 520 HS / IXUS 500 HS / IXY 3") },
{ (long int)0x3260000, N_("PowerShot A3400 IS") },
{ (long int)0x3270000, N_("PowerShot A2400 IS") },
{ (long int)0x3280000, N_("PowerShot A2300") },
{ (long int)0x3330000, N_("PowerShot G15") },
{ (long int)0x3340000, N_("PowerShot SX50") },
{ (long int)0x3350000, N_("PowerShot SX160 IS") },
{ (long int)0x3360000, N_("PowerShot S110 (new)") },
{ (long int)0x3370000, N_("PowerShot SX500 IS") },
{ (long int)0x3380000, N_("PowerShot N") },
{ (long int)0x3390000, N_("IXUS 245 HS / IXY 430F") },
{ (long int)0x3400000, N_("PowerShot SX280 HS") },
{ (long int)0x3410000, N_("PowerShot SX270 HS") },
{ (long int)0x3420000, N_("PowerShot A3500 IS") },
{ (long int)0x3430000, N_("PowerShot A2600") },
{ (long int)0x3450000, N_("PowerShot A1400") },
{ (long int)0x3460000, N_("PowerShot ELPH 130 IS / IXUS 140 / IXY 110F") },
{ (long int)0x3470000, N_("PowerShot ELPH 115/120 IS / IXUS 132/135 / IXY 90F/100F") },
{ (long int)0x3490000, N_("PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F") },
{ (long int)0x3510000, N_("PowerShot A2500") },
{ (long int)0x3540000, N_("PowerShot G16") },
{ (long int)0x3550000, N_("PowerShot S120") },
{ (long int)0x3560000, N_("PowerShot SX170 IS") },
{ (long int)0x3580000, N_("PowerShot SX510 HS") },
{ (long int)0x3590000, N_("PowerShot S200 (new)") },
{ (long int)0x3600000, N_("IXY 620F") },
{ (long int)0x3610000, N_("PowerShot N100") },
{ (long int)0x3640000, N_("PowerShot G1 X Mark II") },
{ (long int)0x3650000, N_("PowerShot D30") },
{ (long int)0x3660000, N_("PowerShot SX700 HS") },
{ (long int)0x3670000, N_("PowerShot SX600 HS") },
{ (long int)0x3680000, N_("PowerShot ELPH 140 IS / IXUS 150") },
{ (long int)0x3690000, N_("PowerShot ELPH 135 / IXUS 145 / IXY 120") },
{ (long int)0x3700000, N_("PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630") },
{ (long int)0x3710000, N_("PowerShot ELPH 150 IS / IXUS 155 / IXY 140") },
{ (long int)0x3750000, N_("PowerShot SX60 HS") },
{ (long int)0x3760000, N_("PowerShot SX520 HS") },
{ (long int)0x3780000, N_("PowerShot G7 X") },
{ (long int)0x3800000, N_("PowerShot SX530 HS") },
{ (long int)0x3820000, N_("PowerShot SX710 HS") },
{ (long int)0x3830000, N_("PowerShot SX610 HS") },
{ (long int)0x4040000, N_("PowerShot G1") },
{ (long int)0x6040000, N_("PowerShot S100 / Digital IXUS / IXY Digital") },
{ (long int)0x4007d673, N_("DC19/DC21/DC22") },
{ (long int)0x4007d674, N_("XH A1") },
{ (long int)0x4007d675, N_("HV10") },
{ (long int)0x4007d676, N_("MD130/MD140/MD150/MD160/ZR850") },
{ (long int)0x4007d777, N_("DC50") },
{ (long int)0x4007d778, N_("HV20") },
{ (long int)0x4007d779, N_("DC211") },
{ (long int)0x4007d77a, N_("HG10") },
{ (long int)0x4007d77b, N_("HR10") },
{ (long int)0x4007d77c, N_("MD255/ZR950") },
{ (long int)0x4007d81c, N_("HF11") },
{ (long int)0x4007d878, N_("HV30") },
{ (long int)0x4007d87c, N_("XH A1S") },
{ (long int)0x4007d87e, N_("DC301/DC310/DC311/DC320/DC330") },
{ (long int)0x4007d87f, N_("FS100") },
{ (long int)0x4007d880, N_("HF10") },
{ (long int)0x4007d882, N_("HG20/HG21") },
{ (long int)0x4007d925, N_("HF21") },
{ (long int)0x4007d926, N_("HF S11") },
{ (long int)0x4007d978, N_("HV40") },
{ (long int)0x4007d987, N_("DC410/DC411/DC420") },
{ (long int)0x4007d988, N_("FS19/FS20/FS21/FS22/FS200") },
{ (long int)0x4007d989, N_("HF20/HF200") },
{ (long int)0x4007d98a, N_("HF S10/S100") },
{ (long int)0x4007da8e, N_("HF R10/R16/R17/R18/R100/R106") },
{ (long int)0x4007da8f, N_("HF M30/M31/M36/M300/M306") },
{ (long int)0x4007da90, N_("HF S20/S21/S200") },
{ (long int)0x4007da92, N_("FS31/FS36/FS37/FS300/FS305/FS306/FS307") },
{ (long int)0x4007dda9, N_("HF G25") },
{ (long int)0x80000001, N_("EOS-1D") },
{ (long int)0x80000167, N_("EOS-1DS") },
{ (long int)0x80000168, N_("EOS 10D") },
{ (long int)0x80000169, N_("EOS-1D Mark III") },
{ (long int)0x80000170, N_("EOS Digital Rebel / 300D / Kiss Digital") },
{ (long int)0x80000174, N_("EOS-1D Mark II") },
{ (long int)0x80000175, N_("EOS 20D") },
{ (long int)0x80000176, N_("EOS Digital Rebel XSi / 450D / Kiss X2") },
{ (long int)0x80000188, N_("EOS-1Ds Mark II") },
{ (long int)0x80000189, N_("EOS Digital Rebel XT / 350D / Kiss Digital N") },
{ (long int)0x80000190, N_("EOS 40D") },
{ (long int)0x80000213, N_("EOS 5D") },
{ (long int)0x80000215, N_("EOS-1Ds Mark III") },
{ (long int)0x80000218, N_("EOS 5D Mark II") },
{ (long int)0x80000219, N_("WFT-E1") },
{ (long int)0x80000232, N_("EOS-1D Mark II N") },
{ (long int)0x80000234, N_("EOS 30D") },
{ (long int)0x80000236, N_("EOS Digital Rebel XTi / 400D / Kiss Digital X") },
{ (long int)0x80000241, N_("WFT-E2") },
{ (long int)0x80000246, N_("WFT-E3") },
{ (long int)0x80000250, N_("EOS 7D") },
{ (long int)0x80000252, N_("EOS Rebel T1i / 500D / Kiss X3") },
{ (long int)0x80000254, N_("EOS Rebel XS / 1000D / Kiss F") },
{ (long int)0x80000261, N_("EOS 50D") },
{ (long int)0x80000269, N_("EOS-1D X") },
{ (long int)0x80000270, N_("EOS Rebel T2i / 550D / Kiss X4") },
{ (long int)0x80000271, N_("WFT-E4") },
{ (long int)0x80000273, N_("WFT-E5") },
{ (long int)0x80000281, N_("EOS-1D Mark IV") },
{ (long int)0x80000285, N_("EOS 5D Mark III") },
{ (long int)0x80000286, N_("EOS Rebel T3i / 600D / Kiss X5") },
{ (long int)0x80000287, N_("EOS 60D") },
{ (long int)0x80000288, N_("EOS Rebel T3 / 1100D / Kiss X50") },
{ (long int)0x80000289, N_("EOS 7D Mark II") },
{ (long int)0x80000297, N_("WFT-E2 II") },
{ (long int)0x80000298, N_("WFT-E4 II") },
{ (long int)0x80000301, N_("EOS Rebel T4i / 650D / Kiss X6i") },
{ (long int)0x80000302, N_("EOS 6D") },
{ (long int)0x80000324, N_("EOS-1D C") },
{ (long int)0x80000325, N_("EOS 70D") },
{ (long int)0x80000326, N_("EOS Rebel T5i / 700D / Kiss X7i") },
{ (long int)0x80000327, N_("EOS Rebel T5 / 1200D / Kiss X70") },
{ (long int)0x80000331, N_("EOS M") },
{ (long int)0x80000355, N_("EOS M2") },
{ (long int)0x80000346, N_("EOS Rebel SL1 / 100D / Kiss X7") },
{ (long int)0x1010000, "PowerShot A30" },
{ (long int)0x1040000, "PowerShot S300 / Digital IXUS 300 / IXY Digital 300" },
{ (long int)0x1060000, "PowerShot A20" },
{ (long int)0x1080000, "PowerShot A10" },
{ (long int)0x1090000, "PowerShot S110 / Digital IXUS v / IXY Digital 200" },
{ (long int)0x1100000, "PowerShot G2" },
{ (long int)0x1110000, "PowerShot S40" },
{ (long int)0x1120000, "PowerShot S30" },
{ (long int)0x1130000, "PowerShot A40" },
{ (long int)0x1140000, "EOS D30" },
{ (long int)0x1150000, "PowerShot A100" },
{ (long int)0x1160000, "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a" },
{ (long int)0x1170000, "PowerShot A200" },
{ (long int)0x1180000, "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a" },
{ (long int)0x1190000, "PowerShot G3" },
{ (long int)0x1210000, "PowerShot S45" },
{ (long int)0x1230000, "PowerShot SD100 / Digital IXUS II / IXY Digital 30" },
{ (long int)0x1240000, "PowerShot S230 / Digital IXUS v3 / IXY Digital 320" },
{ (long int)0x1250000, "PowerShot A70" },
{ (long int)0x1260000, "PowerShot A60" },
{ (long int)0x1270000, "PowerShot S400 / Digital IXUS 400 / IXY Digital 400" },
{ (long int)0x1290000, "PowerShot G5" },
{ (long int)0x1300000, "PowerShot A300" },
{ (long int)0x1310000, "PowerShot S50" },
{ (long int)0x1340000, "PowerShot A80" },
{ (long int)0x1350000, "PowerShot SD10 / Digital IXUS i / IXY Digital L" },
{ (long int)0x1360000, "PowerShot S1 IS" },
{ (long int)0x1370000, "PowerShot Pro1" },
{ (long int)0x1380000, "PowerShot S70" },
{ (long int)0x1390000, "PowerShot S60" },
{ (long int)0x1400000, "PowerShot G6" },
{ (long int)0x1410000, "PowerShot S500 / Digital IXUS 500 / IXY Digital 500" },
{ (long int)0x1420000, "PowerShot A75" },
{ (long int)0x1440000, "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a" },
{ (long int)0x1450000, "PowerShot A400" },
{ (long int)0x1470000, "PowerShot A310" },
{ (long int)0x1490000, "PowerShot A85" },
{ (long int)0x1520000, "PowerShot S410 / Digital IXUS 430 / IXY Digital 450" },
{ (long int)0x1530000, "PowerShot A95" },
{ (long int)0x1540000, "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50" },
{ (long int)0x1550000, "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40" },
{ (long int)0x1560000, "PowerShot A520" },
{ (long int)0x1570000, "PowerShot A510" },
{ (long int)0x1590000, "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2" },
{ (long int)0x1640000, "PowerShot S2 IS" },
{ (long int)0x1650000, "PowerShot SD430 / IXUS Wireless / IXY Wireless" },
{ (long int)0x1660000, "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600" },
{ (long int)0x1668000, "EOS D60" },
{ (long int)0x1700000, "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3" },
{ (long int)0x1740000, "PowerShot A430" },
{ (long int)0x1750000, "PowerShot A410" },
{ (long int)0x1760000, "PowerShot S80" },
{ (long int)0x1780000, "PowerShot A620" },
{ (long int)0x1790000, "PowerShot A610" },
{ (long int)0x1800000, "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80" },
{ (long int)0x1810000, "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60" },
{ (long int)0x1820000, "PowerShot TX1" },
{ (long int)0x1870000, "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55" },
{ (long int)0x1880000, "PowerShot A420" },
{ (long int)0x1890000, "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000" },
{ (long int)0x1900000, "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700" },
{ (long int)0x1920000, "PowerShot A700" },
{ (long int)0x1940000, "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS" },
{ (long int)0x1950000, "PowerShot S3 IS" },
{ (long int)0x1960000, "PowerShot A540" },
{ (long int)0x1970000, "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70" },
{ (long int)0x1980000, "PowerShot G7" },
{ (long int)0x1990000, "PowerShot A530" },
{ (long int)0x2000000, "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS" },
{ (long int)0x2010000, "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4" },
{ (long int)0x2020000, "PowerShot A710 IS" },
{ (long int)0x2030000, "PowerShot A640" },
{ (long int)0x2040000, "PowerShot A630" },
{ (long int)0x2090000, "PowerShot S5 IS" },
{ (long int)0x2100000, "PowerShot A460" },
{ (long int)0x2120000, "PowerShot SD850 IS / Digital IXUS 950 IS" },
{ (long int)0x2130000, "PowerShot A570 IS" },
{ (long int)0x2140000, "PowerShot A560" },
{ (long int)0x2150000, "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90" },
{ (long int)0x2160000, "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10" },
{ (long int)0x2180000, "PowerShot A550" },
{ (long int)0x2190000, "PowerShot A450" },
{ (long int)0x2230000, "PowerShot G9" },
{ (long int)0x2240000, "PowerShot A650 IS" },
{ (long int)0x2260000, "PowerShot A720 IS" },
{ (long int)0x2290000, "PowerShot SX100 IS" },
{ (long int)0x2300000, "PowerShot SD950 IS / Digital IXUS 960 IS / IXY Digital 2000 IS" },
{ (long int)0x2310000, "PowerShot SD870 IS / Digital IXUS 860 IS / IXY Digital 910 IS" },
{ (long int)0x2320000, "PowerShot SD890 IS / Digital IXUS 970 IS / IXY Digital 820 IS" },
{ (long int)0x2360000, "PowerShot SD790 IS / Digital IXUS 90 IS / IXY Digital 95 IS" },
{ (long int)0x2370000, "PowerShot SD770 IS / Digital IXUS 85 IS / IXY Digital 25 IS" },
{ (long int)0x2380000, "PowerShot A590 IS" },
{ (long int)0x2390000, "PowerShot A580" },
{ (long int)0x2420000, "PowerShot A470" },
{ (long int)0x2430000, "PowerShot SD1100 IS / Digital IXUS 80 IS / IXY Digital 20 IS" },
{ (long int)0x2460000, "PowerShot SX1 IS" },
{ (long int)0x2470000, "PowerShot SX10 IS" },
{ (long int)0x2480000, "PowerShot A1000 IS" },
{ (long int)0x2490000, "PowerShot G10" },
{ (long int)0x2510000, "PowerShot A2000 IS" },
{ (long int)0x2520000, "PowerShot SX110 IS" },
{ (long int)0x2530000, "PowerShot SD990 IS / Digital IXUS 980 IS / IXY Digital 3000 IS" },
{ (long int)0x2540000, "PowerShot SD880 IS / Digital IXUS 870 IS / IXY Digital 920 IS" },
{ (long int)0x2550000, "PowerShot E1" },
{ (long int)0x2560000, "PowerShot D10" },
{ (long int)0x2570000, "PowerShot SD960 IS / Digital IXUS 110 IS / IXY Digital 510 IS" },
{ (long int)0x2580000, "PowerShot A2100 IS" },
{ (long int)0x2590000, "PowerShot A480" },
{ (long int)0x2600000, "PowerShot SX200 IS" },
{ (long int)0x2610000, "PowerShot SD970 IS / Digital IXUS 990 IS / IXY Digital 830 IS" },
{ (long int)0x2620000, "PowerShot SD780 IS / Digital IXUS 100 IS / IXY Digital 210 IS" },
{ (long int)0x2630000, "PowerShot A1100 IS" },
{ (long int)0x2640000, "PowerShot SD1200 IS / Digital IXUS 95 IS / IXY Digital 110 IS" },
{ (long int)0x2700000, "PowerShot G11" },
{ (long int)0x2710000, "PowerShot SX120 IS" },
{ (long int)0x2720000, "PowerShot S90" },
{ (long int)0x2750000, "PowerShot SX20 IS" },
{ (long int)0x2760000, "PowerShot SD980 IS / Digital IXUS 200 IS / IXY Digital 930 IS" },
{ (long int)0x2770000, "PowerShot SD940 IS / Digital IXUS 120 IS / IXY Digital 220 IS" },
{ (long int)0x2800000, "PowerShot A495" },
{ (long int)0x2810000, "PowerShot A490" },
{ (long int)0x2820000, "PowerShot A3100 IS / A3150 IS" },
{ (long int)0x2830000, "PowerShot A3000 IS" },
{ (long int)0x2840000, "PowerShot SD1400 IS / IXUS 130 / IXY 400F" },
{ (long int)0x2850000, "PowerShot SD1300 IS / IXUS 105 / IXY 200F" },
{ (long int)0x2860000, "PowerShot SD3500 IS / IXUS 210 / IXY 10S" },
{ (long int)0x2870000, "PowerShot SX210 IS" },
{ (long int)0x2880000, "PowerShot SD4000 IS / IXUS 300 HS / IXY 30S" },
{ (long int)0x2890000, "PowerShot SD4500 IS / IXUS 1000 HS / IXY 50S" },
{ (long int)0x2920000, "PowerShot G12" },
{ (long int)0x2930000, "PowerShot SX30 IS" },
{ (long int)0x2940000, "PowerShot SX130 IS" },
{ (long int)0x2950000, "PowerShot S95" },
{ (long int)0x2980000, "PowerShot A3300 IS" },
{ (long int)0x2990000, "PowerShot A3200 IS" },
{ (long int)0x3000000, "PowerShot ELPH 500 HS / IXUS 310 HS / IXY 31S" },
{ (long int)0x3010000, "PowerShot Pro90 IS" },
{ (long int)0x3010001, "PowerShot A800" },
{ (long int)0x3020000, "PowerShot ELPH 100 HS / IXUS 115 HS / IXY 210F" },
{ (long int)0x3030000, "PowerShot SX230 HS" },
{ (long int)0x3040000, "PowerShot ELPH 300 HS / IXUS 220 HS / IXY 410F" },
{ (long int)0x3050000, "PowerShot A2200" },
{ (long int)0x3060000, "PowerShot A1200" },
{ (long int)0x3070000, "PowerShot SX220 HS" },
{ (long int)0x3080000, "PowerShot G1 X" },
{ (long int)0x3090000, "PowerShot SX150 IS" },
{ (long int)0x3100000, "PowerShot ELPH 510 HS / IXUS 1100 HS / IXY 51S" },
{ (long int)0x3110000, "PowerShot S100 (new)" },
{ (long int)0x3130000, "PowerShot SX40 HS" },
{ (long int)0x3120000, "PowerShot ELPH 310 HS / IXUS 230 HS / IXY 600F" },
{ (long int)0x3140000, "IXY 32S" },
{ (long int)0x3160000, "PowerShot A1300" },
{ (long int)0x3170000, "PowerShot A810" },
{ (long int)0x3180000, "PowerShot ELPH 320 HS / IXUS 240 HS / IXY 420F" },
{ (long int)0x3190000, "PowerShot ELPH 110 HS / IXUS 125 HS / IXY 220F" },
{ (long int)0x3200000, "PowerShot D20" },
{ (long int)0x3210000, "PowerShot A4000 IS" },
{ (long int)0x3220000, "PowerShot SX260 HS" },
{ (long int)0x3230000, "PowerShot SX240 HS" },
{ (long int)0x3240000, "PowerShot ELPH 530 HS / IXUS 510 HS / IXY 1" },
{ (long int)0x3250000, "PowerShot ELPH 520 HS / IXUS 500 HS / IXY 3" },
{ (long int)0x3260000, "PowerShot A3400 IS" },
{ (long int)0x3270000, "PowerShot A2400 IS" },
{ (long int)0x3280000, "PowerShot A2300" },
{ (long int)0x3330000, "PowerShot G15" },
{ (long int)0x3340000, "PowerShot SX50" },
{ (long int)0x3350000, "PowerShot SX160 IS" },
{ (long int)0x3360000, "PowerShot S110 (new)" },
{ (long int)0x3370000, "PowerShot SX500 IS" },
{ (long int)0x3380000, "PowerShot N" },
{ (long int)0x3390000, "IXUS 245 HS / IXY 430F" },
{ (long int)0x3400000, "PowerShot SX280 HS" },
{ (long int)0x3410000, "PowerShot SX270 HS" },
{ (long int)0x3420000, "PowerShot A3500 IS" },
{ (long int)0x3430000, "PowerShot A2600" },
{ (long int)0x3450000, "PowerShot A1400" },
{ (long int)0x3460000, "PowerShot ELPH 130 IS / IXUS 140 / IXY 110F" },
{ (long int)0x3470000, "PowerShot ELPH 115/120 IS / IXUS 132/135 / IXY 90F/100F" },
{ (long int)0x3490000, "PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F" },
{ (long int)0x3510000, "PowerShot A2500" },
{ (long int)0x3540000, "PowerShot G16" },
{ (long int)0x3550000, "PowerShot S120" },
{ (long int)0x3560000, "PowerShot SX170 IS" },
{ (long int)0x3580000, "PowerShot SX510 HS" },
{ (long int)0x3590000, "PowerShot S200 (new)" },
{ (long int)0x3600000, "IXY 620F" },
{ (long int)0x3610000, "PowerShot N100" },
{ (long int)0x3640000, "PowerShot G1 X Mark II" },
{ (long int)0x3650000, "PowerShot D30" },
{ (long int)0x3660000, "PowerShot SX700 HS" },
{ (long int)0x3670000, "PowerShot SX600 HS" },
{ (long int)0x3680000, "PowerShot ELPH 140 IS / IXUS 150" },
{ (long int)0x3690000, "PowerShot ELPH 135 / IXUS 145 / IXY 120" },
{ (long int)0x3700000, "PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630" },
{ (long int)0x3710000, "PowerShot ELPH 150 IS / IXUS 155 / IXY 140" },
{ (long int)0x3750000, "PowerShot SX60 HS" },
{ (long int)0x3760000, "PowerShot SX520 HS" },
{ (long int)0x3780000, "PowerShot G7 X" },
{ (long int)0x3800000, "PowerShot SX530 HS" },
{ (long int)0x3820000, "PowerShot SX710 HS" },
{ (long int)0x3830000, "PowerShot SX610 HS" },
{ (long int)0x4040000, "PowerShot G1" },
{ (long int)0x6040000, "PowerShot S100 / Digital IXUS / IXY Digital" },
{ (long int)0x4007d673, "DC19/DC21/DC22" },
{ (long int)0x4007d674, "XH A1" },
{ (long int)0x4007d675, "HV10" },
{ (long int)0x4007d676, "MD130/MD140/MD150/MD160/ZR850" },
{ (long int)0x4007d777, "DC50" },
{ (long int)0x4007d778, "HV20" },
{ (long int)0x4007d779, "DC211" },
{ (long int)0x4007d77a, "HG10" },
{ (long int)0x4007d77b, "HR10" },
{ (long int)0x4007d77c, "MD255/ZR950" },
{ (long int)0x4007d81c, "HF11" },
{ (long int)0x4007d878, "HV30" },
{ (long int)0x4007d87c, "XH A1S" },
{ (long int)0x4007d87e, "DC301/DC310/DC311/DC320/DC330" },
{ (long int)0x4007d87f, "FS100" },
{ (long int)0x4007d880, "HF10" },
{ (long int)0x4007d882, "HG20/HG21" },
{ (long int)0x4007d925, "HF21" },
{ (long int)0x4007d926, "HF S11" },
{ (long int)0x4007d978, "HV40" },
{ (long int)0x4007d987, "DC410/DC411/DC420" },
{ (long int)0x4007d988, "FS19/FS20/FS21/FS22/FS200" },
{ (long int)0x4007d989, "HF20/HF200" },
{ (long int)0x4007d98a, "HF S10/S100" },
{ (long int)0x4007da8e, "HF R10/R16/R17/R18/R100/R106" },
{ (long int)0x4007da8f, "HF M30/M31/M36/M300/M306" },
{ (long int)0x4007da90, "HF S20/S21/S200" },
{ (long int)0x4007da92, "FS31/FS36/FS37/FS300/FS305/FS306/FS307" },
{ (long int)0x4007dda9, "HF G25" },
{ (long int)0x80000001, "EOS-1D" },
{ (long int)0x80000167, "EOS-1DS" },
{ (long int)0x80000168, "EOS 10D" },
{ (long int)0x80000169, "EOS-1D Mark III" },
{ (long int)0x80000170, "EOS Digital Rebel / 300D / Kiss Digital" },
{ (long int)0x80000174, "EOS-1D Mark II" },
{ (long int)0x80000175, "EOS 20D" },
{ (long int)0x80000176, "EOS Digital Rebel XSi / 450D / Kiss X2" },
{ (long int)0x80000188, "EOS-1Ds Mark II" },
{ (long int)0x80000189, "EOS Digital Rebel XT / 350D / Kiss Digital N" },
{ (long int)0x80000190, "EOS 40D" },
{ (long int)0x80000213, "EOS 5D" },
{ (long int)0x80000215, "EOS-1Ds Mark III" },
{ (long int)0x80000218, "EOS 5D Mark II" },
{ (long int)0x80000219, "WFT-E1" },
{ (long int)0x80000232, "EOS-1D Mark II N" },
{ (long int)0x80000234, "EOS 30D" },
{ (long int)0x80000236, "EOS Digital Rebel XTi / 400D / Kiss Digital X" },
{ (long int)0x80000241, "WFT-E2" },
{ (long int)0x80000246, "WFT-E3" },
{ (long int)0x80000250, "EOS 7D" },
{ (long int)0x80000252, "EOS Rebel T1i / 500D / Kiss X3" },
{ (long int)0x80000254, "EOS Rebel XS / 1000D / Kiss F" },
{ (long int)0x80000261, "EOS 50D" },
{ (long int)0x80000269, "EOS-1D X" },
{ (long int)0x80000270, "EOS Rebel T2i / 550D / Kiss X4" },
{ (long int)0x80000271, "WFT-E4" },
{ (long int)0x80000273, "WFT-E5" },
{ (long int)0x80000281, "EOS-1D Mark IV" },
{ (long int)0x80000285, "EOS 5D Mark III" },
{ (long int)0x80000286, "EOS Rebel T3i / 600D / Kiss X5" },
{ (long int)0x80000287, "EOS 60D" },
{ (long int)0x80000288, "EOS Rebel T3 / 1100D / Kiss X50" },
{ (long int)0x80000289, "EOS 7D Mark II" },
{ (long int)0x80000297, "WFT-E2 II" },
{ (long int)0x80000298, "WFT-E4 II" },
{ (long int)0x80000301, "EOS Rebel T4i / 650D / Kiss X6i" },
{ (long int)0x80000302, "EOS 6D" },
{ (long int)0x80000324, "EOS-1D C" },
{ (long int)0x80000325, "EOS 70D" },
{ (long int)0x80000326, "EOS Rebel T5i / 700D / Kiss X7i" },
{ (long int)0x80000327, "EOS Rebel T5 / 1200D / Kiss X70" },
{ (long int)0x80000331, "EOS M" },
{ (long int)0x80000355, "EOS M2" },
{ (long int)0x80000346, "EOS Rebel SL1 / 100D / Kiss X7" },
};
//! SerialNumberFormat, tag 0x0015

260
src/nikonmn.cpp
Unescape Escape View File

@ -927,59 +927,59 @@ namespace Exiv2 {
extern const TagDetails nikonFlashFirmware[] = {
{ 0x0000, N_("n/a") },
{ 0x0101, N_("1.01 (SB-800 or Metz 58 AF-1)") },
{ 0x0103, N_("1.03 (SB-800)") },
{ 0x0201, N_("2.01 (SB-800)") },
{ 0x0204, N_("2.04 (SB-600)") },
{ 0x0205, N_("2.05 (SB-600)") },
{ 0x0301, N_("3.01 (SU-800 Remote Commander)") },
{ 0x0401, N_("4.01 (SB-400)") },
{ 0x0402, N_("4.02 (SB-400)") },
{ 0x0404, N_("4.04 (SB-400)") },
{ 0x0501, N_("5.01 (SB-900)") },
{ 0x0502, N_("5.02 (SB-900)") },
{ 0x0601, N_("6.01 (SB-700)") },
{ 0x0701, N_("7.01 (SB-910)") }
{ 0x0103, "1.03 (SB-800)" },
{ 0x0201, "2.01 (SB-800)" },
{ 0x0204, "2.04 (SB-600)" },
{ 0x0205, "2.05 (SB-600)" },
{ 0x0301, "3.01 (SU-800 Remote Commander)" },
{ 0x0401, "4.01 (SB-400)" },
{ 0x0402, "4.02 (SB-400)" },
{ 0x0404, "4.04 (SB-400)" },
{ 0x0501, "5.01 (SB-900)" },
{ 0x0502, "5.02 (SB-900)" },
{ 0x0601, "6.01 (SB-700)" },
{ 0x0701, "7.01 (SB-910)" }
};
//! FlashGNDistance
extern const TagDetails nikonFlashGNDistance[] = {
{ 0, N_("None") },
{ 1, N_("0.1 m") },
{ 2, N_("0.2 m") },
{ 3, N_("0.3 m") },
{ 4, N_("0.4 m") },
{ 5, N_("0.5 m") },
{ 6, N_("0.6 m") },
{ 7, N_("0.7 m") },
{ 8, N_("0.8 m") },
{ 9, N_("0.9 m") },
{ 10, N_("1.0 m") },
{ 11, N_("1.1 m") },
{ 12, N_("1.3 m") },
{ 13, N_("1.4 m") },
{ 14, N_("1.6 m") },
{ 15, N_("1.8 m") },
{ 16, N_("2.0 m") },
{ 17, N_("2.2 m") },
{ 18, N_("2.5 m") },
{ 19, N_("2.8 m") },
{ 20, N_("3.2 m") },
{ 21, N_("3.6 m") },
{ 22, N_("4.0 m") },
{ 23, N_("4.5 m") },
{ 24, N_("5.0 m") },
{ 25, N_("5.6 m") },
{ 26, N_("6.3 m") },
{ 27, N_("7.1 m") },
{ 28, N_("8.0 m") },
{ 29, N_("9.0 m") },
{ 30, N_("10.0 m") },
{ 31, N_("11.0 m") },
{ 32, N_("13.0 m") },
{ 33, N_("14.0 m") },
{ 34, N_("16.0 m") },
{ 35, N_("18.0 m") },
{ 36, N_("20.0 m") },
{ 1, "0.1 m" },
{ 2, "0.2 m" },
{ 3, "0.3 m" },
{ 4, "0.4 m" },
{ 5, "0.5 m" },
{ 6, "0.6 m" },
{ 7, "0.7 m" },
{ 8, "0.8 m" },
{ 9, "0.9 m" },
{ 10, "1.0 m" },
{ 11, "1.1 m" },
{ 12, "1.3 m" },
{ 13, "1.4 m" },
{ 14, "1.6 m" },
{ 15, "1.8 m" },
{ 16, "2.0 m" },
{ 17, "2.2 m" },
{ 18, "2.5 m" },
{ 19, "2.8 m" },
{ 20, "3.2 m" },
{ 21, "3.6 m" },
{ 22, "4.0 m" },
{ 23, "4.5 m" },
{ 24, "5.0 m" },
{ 25, "5.6 m" },
{ 26, "6.3 m" },
{ 27, "7.1 m" },
{ 28, "8.0 m" },
{ 29, "9.0 m" },
{ 30, "10.0 m" },
{ 31, "11.0 m" },
{ 32, "13.0 m" },
{ 33, "14.0 m" },
{ 34, "16.0 m" },
{ 35, "18.0 m" },
{ 36, "20.0 m" },
{ 255, N_("n/a") }
};
@ -1107,47 +1107,47 @@ namespace Exiv2 {
//! AfFineTuneAdj D300 (a)
extern const TagDetails nikonAfFineTuneAdj1[] = {
{ 0x0000, N_("0") },
{ 0x003a, N_("+1") },
{ 0x003b, N_("+2") },
{ 0x003c, N_("+4") },
{ 0x003d, N_("+8") },
{ 0x003e, N_("+16") },
{ 0x00c2, N_("-16") },
{ 0x00c3, N_("-8") },
{ 0x00c4, N_("-4") },
{ 0x00c5, N_("-2") },
{ 0x00c6, N_("-1") },
{ 0x103e, N_("+17") },
{ 0x10c2, N_("-17") },
{ 0x203d, N_("+9") },
{ 0x203e, N_("+18") },
{ 0x20c2, N_("-18") },
{ 0x20c3, N_("-9") },
{ 0x303e, N_("+19") },
{ 0x30c2, N_("-19") },
{ 0x403c, N_("+5") },
{ 0x403d, N_("+10") },
{ 0x403e, N_("+20") },
{ 0x40c2, N_("-20") },
{ 0x40c3, N_("-10") },
{ 0x40c4, N_("-5") },
{ 0x603d, N_("+11") },
{ 0x60c3, N_("-11") },
{ 0x803b, N_("+3") },
{ 0x803c, N_("+6") },
{ 0x803d, N_("+12") },
{ 0x80c3, N_("-12") },
{ 0x80c4, N_("-6") },
{ 0x80c5, N_("-3") },
{ 0xa03d, N_("+13") },
{ 0xa0c3, N_("-13") },
{ 0xc03c, N_("+7") },
{ 0xc03d, N_("+14") },
{ 0xc0c3, N_("-14") },
{ 0xc0c4, N_("-7") },
{ 0xe03d, N_("+15") },
{ 0xe0c3, N_("-15") }
{ 0x0000, "0" },
{ 0x003a, "+1" },
{ 0x003b, "+2" },
{ 0x003c, "+4" },
{ 0x003d, "+8" },
{ 0x003e, "+16" },
{ 0x00c2, "-16" },
{ 0x00c3, "-8" },
{ 0x00c4, "-4" },
{ 0x00c5, "-2" },
{ 0x00c6, "-1" },
{ 0x103e, "+17" },
{ 0x10c2, "-17" },
{ 0x203d, "+9" },
{ 0x203e, "+18" },
{ 0x20c2, "-18" },
{ 0x20c3, "-9" },
{ 0x303e, "+19" },
{ 0x30c2, "-19" },
{ 0x403c, "+5" },
{ 0x403d, "+10" },
{ 0x403e, "+20" },
{ 0x40c2, "-20" },
{ 0x40c3, "-10" },
{ 0x40c4, "-5" },
{ 0x603d, "+11" },
{ 0x60c3, "-11" },
{ 0x803b, "+3" },
{ 0x803c, "+6" },
{ 0x803d, "+12" },
{ 0x80c3, "-12" },
{ 0x80c4, "-6" },
{ 0x80c5, "-3" },
{ 0xa03d, "+13" },
{ 0xa0c3, "-13" },
{ 0xc03c, "+7" },
{ 0xc03d, "+14" },
{ 0xc0c3, "-14" },
{ 0xc0c4, "-7" },
{ 0xe03d, "+15" },
{ 0xe0c3, "-15" }
};
// Nikon3 Shot Info D300 (a) Tag Info
@ -1167,47 +1167,47 @@ namespace Exiv2 {
//! AfFineTuneAdj D300 (b)
extern const TagDetails nikonAfFineTuneAdj2[] = {
{ 0x0000, N_("0") },
{ 0x043e, N_("+13") },
{ 0x04c2, N_("-13") },
{ 0x183d, N_("+7") },
{ 0x183e, N_("+14") },
{ 0x18c2, N_("-14") },
{ 0x18c3, N_("-7") },
{ 0x2c3e, N_("+15") },
{ 0x2cc2, N_("-15") },
{ 0x403a, N_("+1") },
{ 0x403b, N_("+2") },
{ 0x403c, N_("+4") },
{ 0x403d, N_("+8") },
{ 0x403e, N_("+16") },
{ 0x40c2, N_("-16") },
{ 0x40c3, N_("-8") },
{ 0x40c4, N_("-4") },
{ 0x40c5, N_("-2") },
{ 0x40c6, N_("-1") },
{ 0x543e, N_("+17") },
{ 0x54c2, N_("-17") },
{ 0x683d, N_("+9") },
{ 0x683e, N_("+18") },
{ 0x68c2, N_("-18") },
{ 0x68c3, N_("-9") },
{ 0x7c3e, N_("+19") },
{ 0x7cc2, N_("-19") },
{ 0x903c, N_("+5") },
{ 0x903d, N_("+10") },
{ 0x903e, N_("+20") },
{ 0x90c2, N_("-20") },
{ 0x90c3, N_("-10") },
{ 0x90c4, N_("-5") },
{ 0xb83d, N_("+11") },
{ 0xb8c3, N_("-11") },
{ 0xe03b, N_("+3") },
{ 0xe03c, N_("+6") },
{ 0xe03d, N_("+12") },
{ 0xe0c3, N_("-12") },
{ 0xe0c4, N_("-6") },
{ 0xe0c5, N_("-3") }
{ 0x0000, "0" },
{ 0x043e, "+13" },
{ 0x04c2, "-13" },
{ 0x183d, "+7" },
{ 0x183e, "+14" },
{ 0x18c2, "-14" },
{ 0x18c3, "-7" },
{ 0x2c3e, "+15" },
{ 0x2cc2, "-15" },
{ 0x403a, "+1" },
{ 0x403b, "+2" },
{ 0x403c, "+4" },
{ 0x403d, "+8" },
{ 0x403e, "+16" },
{ 0x40c2, "-16" },
{ 0x40c3, "-8" },
{ 0x40c4, "-4" },
{ 0x40c5, "-2" },
{ 0x40c6, "-1" },
{ 0x543e, "+17" },
{ 0x54c2, "-17" },
{ 0x683d, "+9" },
{ 0x683e, "+18" },
{ 0x68c2, "-18" },
{ 0x68c3, "-9" },
{ 0x7c3e, "+19" },
{ 0x7cc2, "-19" },
{ 0x903c, "+5" },
{ 0x903d, "+10" },
{ 0x903e, "+20" },
{ 0x90c2, "-20" },
{ 0x90c3, "-10" },
{ 0x90c4, "-5" },
{ 0xb83d, "+11" },
{ 0xb8c3, "-11" },
{ 0xe03b, "+3" },
{ 0xe03c, "+6" },
{ 0xe03d, "+12" },
{ 0xe0c3, "-12" },
{ 0xe0c4, "-6" },
{ 0xe0c5, "-3" }
};
// Nikon3 Shot Info D300 (b) Tag Info

220
src/olympusmn.cpp
Unescape Escape View File

@ -923,15 +923,15 @@ namespace Exiv2 {
//! OlympusIp olympusIpAspectRatio, tag 0x101c
extern const TagDetails olympusIpAspectRatio[] = {
{ 1, N_("4:3") },
{ 2, N_("3:2") },
{ 3, N_("16:9") },
{ 4, N_("6:6") },
{ 5, N_("5:4") },
{ 6, N_("7:6") },
{ 7, N_("6:5") },
{ 8, N_("7:5") },
{ 9, N_("3:4") }
{ 1, "4:3" },
{ 2, "3:2" },
{ 3, "16:9" },
{ 4, "6:6" },
{ 5, "5:4" },
{ 6, "7:6" },
{ 7, "6:5" },
{ 8, "7:5" },
{ 9, "3:4" }
};
const TagInfo OlympusMakerNote::tagInfoIp_[] = {
@ -1256,104 +1256,104 @@ namespace Exiv2 {
const char *label;
} lensTypes[] = {
{ { 0, 0, 0 }, N_("None") },
{ { 0, 1, 0 }, N_("Olympus Zuiko Digital ED 50mm F2.0 Macro") },
{ { 0, 1, 1 }, N_("Olympus Zuiko Digital 40-150mm F3.5-4.5") },
{ { 0, 1, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6") },
{ { 0, 2, 0 }, N_("Olympus Zuiko Digital ED 150mm F2.0") },
{ { 0, 2, 16 }, N_("Olympus M.Zuiko Digital 17mm F2.8 Pancake") },
{ { 0, 3, 0 }, N_("Olympus Zuiko Digital ED 300mm F2.8") },
{ { 0, 3, 16 }, N_("Olympus M.Zuiko Digital ED 14-150mm F4.0-5.6") },
{ { 0, 4, 16 }, N_("Olympus M.Zuiko Digital ED 9-18mm F4.0-5.6") },
{ { 0, 5, 0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5") },
{ { 0, 5, 1 }, N_("Olympus Zuiko Digital Pro ED 90-250mm F2.8") },
{ { 0, 5, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6 L") },
{ { 0, 6, 0 }, N_("Olympus Zuiko Digital ED 50-200mm F2.8-3.5") },
{ { 0, 6, 1 }, N_("Olympus Zuiko Digital ED 8mm F3.5 Fisheye") },
{ { 0, 6, 16 }, N_("Olympus M.Zuiko Digital ED 40-150mm F4.0-5.6") },
{ { 0, 7, 0 }, N_("Olympus Zuiko Digital 11-22mm F2.8-3.5") },
{ { 0, 7, 1 }, N_("Olympus Zuiko Digital 18-180mm F3.5-6.3") },
{ { 0, 7, 16 }, N_("Olympus M.Zuiko Digital ED 12mm F2.0") },
{ { 0, 8, 1 }, N_("Olympus Zuiko Digital 70-300mm F4.0-5.6") },
{ { 0, 8, 16 }, N_("Olympus M.Zuiko Digital ED 75-300mm F4.8-6.7") },
{ { 0, 9, 16 }, N_("Olympus M.Zuiko Digital 14-42mm F3.5-5.6 II") },
{ { 0, 16, 1 }, N_("Kenko Tokina Reflex 300mm F6.3 MF Macro") },
{ { 0, 16, 16 }, N_("Olympus M.Zuiko Digital ED 12-50mm F3.5-6.3 EZ") },
{ { 0, 17, 16 }, N_("Olympus M.Zuiko Digital 45mm F1.8") },
{ { 0, 18, 16 }, N_("Olympus M.Zuiko Digital ED 60mm F2.8 Macro") },
{ { 0, 19, 16 }, N_("Olympus M.Zuiko Digital 14-42mm F3.5-5.6 II R") },
{ { 0, 20, 16 }, N_("Olympus M.Zuiko Digital ED 40-150mm F4.0-5.6 R") },
{ { 0, 21, 0 }, N_("Olympus Zuiko Digital ED 7-14mm F4.0") },
{ { 0, 21, 16 }, N_("Olympus M.Zuiko Digital ED 75mm F1.8") },
{ { 0, 22, 16 }, N_("Olympus M.Zuiko Digital 17mm F1.8") },
{ { 0, 23, 0 }, N_("Olympus Zuiko Digital Pro ED 35-100mm F2.0") },
{ { 0, 24, 0 }, N_("Olympus Zuiko Digital 14-45mm F3.5-5.6") },
{ { 0, 24, 16 }, N_("Olympus M.Zuiko Digital ED 75-300mm F4.8-6.7 II") },
{ { 0, 25, 16 }, N_("Olympus M.Zuiko Digital ED 12-40mm F2.8 Pro") },
{ { 0, 32, 0 }, N_("Olympus Zuiko Digital 35mm F3.5 Macro") },
{ { 0, 32, 16 }, N_("Olympus M.Zuiko Digital ED 40-150mm F2.8 Pro") },
{ { 0, 33, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6 EZ") },
{ { 0, 34, 0 }, N_("Olympus Zuiko Digital 17.5-45mm F3.5-5.6") },
{ { 0, 34, 16 }, N_("Olympus M.Zuiko Digital 25mm F1.8") },
{ { 0, 35, 0 }, N_("Olympus Zuiko Digital ED 14-42mm F3.5-5.6") },
{ { 0, 36, 0 }, N_("Olympus Zuiko Digital ED 40-150mm F4.0-5.6") },
{ { 0, 48, 0 }, N_("Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD") },
{ { 0, 49, 0 }, N_("Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD") },
{ { 0, 50, 0 }, N_("Olympus Zuiko Digital ED 14-35mm F2.0 SWD") },
{ { 0, 51, 0 }, N_("Olympus Zuiko Digital 25mm F2.8") },
{ { 0, 52, 0 }, N_("Olympus Zuiko Digital ED 9-18mm F4.0-5.6") },
{ { 0, 53, 0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5 II") },
{ { 1, 1, 0 }, N_("Sigma 18-50mm F3.5-5.6 DC") },
{ { 1, 1, 16 }, N_("Sigma 30mm F2.8 EX DN") },
{ { 1, 2, 0 }, N_("Sigma 55-200mm F4.0-5.6 DC") },
{ { 1, 2, 16 }, N_("Sigma 19mm F2.8 EX DN") },
{ { 1, 3, 0 }, N_("Sigma 18-125mm F3.5-5.6 DC") },
{ { 1, 3, 16 }, N_("Sigma 30mm F2.8 DN | A") },
{ { 1, 4, 0 }, N_("Sigma 18-125mm F3.5-5.6") },
{ { 1, 4, 16 }, N_("Sigma 19mm F2.8 DN | A") },
{ { 1, 5, 0 }, N_("Sigma 30mm F1.4") },
{ { 1, 5, 16 }, N_("Sigma 60mm F2.8 DN | A") },
{ { 1, 6, 0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF") },
{ { 1, 7, 0 }, N_("Sigma 105mm F2.8 DG") },
{ { 1, 8, 0 }, N_("Sigma 150mm F2.8 DG HSM") },
{ { 1, 9, 0 }, N_("Sigma 18-50mm F2.8 EX DC Macro") },
{ { 1, 16, 0 }, N_("Sigma 24mm F1.8 EX DG Aspherical Macro") },
{ { 1, 17, 0 }, N_("Sigma 135-400mm F4.5-5.6 DG ASP APO RF") },
{ { 1, 18, 0 }, N_("Sigma 300-800mm F5.6 EX DG APO") },
{ { 1, 19, 0 }, N_("Sigma 30mm F1.4 EX DC HSM") },
{ { 1, 20, 0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF") },
{ { 1, 21, 0 }, N_("Sigma 10-20mm F4.0-5.6 EX DC HSM") },
{ { 1, 22, 0 }, N_("Sigma 70-200mm F2.8 EX DG Macro HSM II") },
{ { 1, 23, 0 }, N_("Sigma 50mm F1.4 EX DG HSM") },
{ { 2, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.") },
{ { 2, 1, 16 }, N_("Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS") },
{ { 2, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.") },
{ { 2, 2, 16 }, N_("Lumix G Vario 45-200mm F4.0-5.6 Mega OIS") },
{ { 2, 3, 0 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph. Mega OIS") },
{ { 2, 3, 1 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph.") },
{ { 2, 3, 16 }, N_("Lumix G Vario HD 14-140mm F4.0-5.8 Asph. Mega OIS") },
{ { 2, 4, 0 }, N_("Leica D Vario Elmar 14-150mm F3.5-5.6") },
{ { 2, 4, 16 }, N_("Lumix G Vario 7-14mm F4.0 Asph.") },
{ { 2, 5, 16 }, N_("Lumix G 20mm F1.7 Asph.") },
{ { 2, 6, 16 }, N_("Leica DG Macro-Elmarit 45mm F2.8 Asph. Mega OIS") },
{ { 2, 7, 16 }, N_("Lumix G Vario 14-42mm F3.5-5.6 Asph. Mega OIS") },
{ { 2, 8, 16 }, N_("Lumix G Fisheye 8mm F3.5") },
{ { 2, 9, 16 }, N_("Lumix G Vario 100-300mm F4.0-5.6 Mega OIS") },
{ { 2, 16, 16 }, N_("Lumix G 14mm F2.5 Asph.") },
{ { 2, 17, 16 }, N_("Lumix G 3D 12.5mm F12") },
{ { 2, 18, 16 }, N_("Leica DG Summilux 25mm F1.4 Asph.") },
{ { 2, 19, 16 }, N_("Lumix G X Vario PZ 45-175mm F4.0-5.6 Asph. Power OIS") },
{ { 2, 20, 16 }, N_("Lumix G X Vario PZ 14-42mm F3.5-5.6 Asph. Power OIS") },
{ { 2, 21, 16 }, N_("Lumix G X Vario 12-35mm F2.8 Asph. Power OIS") },
{ { 2, 22, 16 }, N_("Lumix G Vario 45-150mm F4.0-5.6 Asph. Mega OIS") },
{ { 2, 23, 16 }, N_("Lumix G X Vario 35-100mm F2.8 Power OIS") },
{ { 2, 24, 16 }, N_("Lumix G Vario 14-42mm F3.5-5.6 II Asph. Mega OIS") },
{ { 2, 25, 16 }, N_("Lumix G Vario 14-140mm F3.5-5.6 Asph. Power OIS") },
{ { 2, 32, 16 }, N_("Lumix G Vario 12-32mm F3.5-5.6 Asph. Mega OIS") },
{ { 2, 33, 16 }, N_("Leica DG Nocticron 42.5mm F1.2 Asph. Power OIS") },
{ { 2, 34, 16 }, N_("Leica DG Summilux 15mm F1.7 Asph.") },
{ { 3, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.") },
{ { 3, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.") },
{ { 5, 1, 16 }, N_("Tamron 14-150mm F3.5-5.8 Di III") },
{ { 0, 1, 0 }, "Olympus Zuiko Digital ED 50mm F2.0 Macro" },
{ { 0, 1, 1 }, "Olympus Zuiko Digital 40-150mm F3.5-4.5" },
{ { 0, 1, 16 }, "Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6" },
{ { 0, 2, 0 }, "Olympus Zuiko Digital ED 150mm F2.0" },
{ { 0, 2, 16 }, "Olympus M.Zuiko Digital 17mm F2.8 Pancake" },
{ { 0, 3, 0 }, "Olympus Zuiko Digital ED 300mm F2.8" },
{ { 0, 3, 16 }, "Olympus M.Zuiko Digital ED 14-150mm F4.0-5.6" },
{ { 0, 4, 16 }, "Olympus M.Zuiko Digital ED 9-18mm F4.0-5.6" },
{ { 0, 5, 0 }, "Olympus Zuiko Digital 14-54mm F2.8-3.5" },
{ { 0, 5, 1 }, "Olympus Zuiko Digital Pro ED 90-250mm F2.8" },
{ { 0, 5, 16 }, "Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6 L" },
{ { 0, 6, 0 }, "Olympus Zuiko Digital ED 50-200mm F2.8-3.5" },
{ { 0, 6, 1 }, "Olympus Zuiko Digital ED 8mm F3.5 Fisheye" },
{ { 0, 6, 16 }, "Olympus M.Zuiko Digital ED 40-150mm F4.0-5.6" },
{ { 0, 7, 0 }, "Olympus Zuiko Digital 11-22mm F2.8-3.5" },
{ { 0, 7, 1 }, "Olympus Zuiko Digital 18-180mm F3.5-6.3" },
{ { 0, 7, 16 }, "Olympus M.Zuiko Digital ED 12mm F2.0" },
{ { 0, 8, 1 }, "Olympus Zuiko Digital 70-300mm F4.0-5.6" },
{ { 0, 8, 16 }, "Olympus M.Zuiko Digital ED 75-300mm F4.8-6.7" },
{ { 0, 9, 16 }, "Olympus M.Zuiko Digital 14-42mm F3.5-5.6 II" },
{ { 0, 16, 1 }, "Kenko Tokina Reflex 300mm F6.3 MF Macro" },
{ { 0, 16, 16 }, "Olympus M.Zuiko Digital ED 12-50mm F3.5-6.3 EZ" },
{ { 0, 17, 16 }, "Olympus M.Zuiko Digital 45mm F1.8" },
{ { 0, 18, 16 }, "Olympus M.Zuiko Digital ED 60mm F2.8 Macro" },
{ { 0, 19, 16 }, "Olympus M.Zuiko Digital 14-42mm F3.5-5.6 II R" },
{ { 0, 20, 16 }, "Olympus M.Zuiko Digital ED 40-150mm F4.0-5.6 R" },
{ { 0, 21, 0 }, "Olympus Zuiko Digital ED 7-14mm F4.0" },
{ { 0, 21, 16 }, "Olympus M.Zuiko Digital ED 75mm F1.8" },
{ { 0, 22, 16 }, "Olympus M.Zuiko Digital 17mm F1.8" },
{ { 0, 23, 0 }, "Olympus Zuiko Digital Pro ED 35-100mm F2.0" },
{ { 0, 24, 0 }, "Olympus Zuiko Digital 14-45mm F3.5-5.6" },
{ { 0, 24, 16 }, "Olympus M.Zuiko Digital ED 75-300mm F4.8-6.7 II" },
{ { 0, 25, 16 }, "Olympus M.Zuiko Digital ED 12-40mm F2.8 Pro" },
{ { 0, 32, 0 }, "Olympus Zuiko Digital 35mm F3.5 Macro" },
{ { 0, 32, 16 }, "Olympus M.Zuiko Digital ED 40-150mm F2.8 Pro" },
{ { 0, 33, 16 }, "Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6 EZ" },
{ { 0, 34, 0 }, "Olympus Zuiko Digital 17.5-45mm F3.5-5.6" },
{ { 0, 34, 16 }, "Olympus M.Zuiko Digital 25mm F1.8" },
{ { 0, 35, 0 }, "Olympus Zuiko Digital ED 14-42mm F3.5-5.6" },
{ { 0, 36, 0 }, "Olympus Zuiko Digital ED 40-150mm F4.0-5.6" },
{ { 0, 48, 0 }, "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD" },
{ { 0, 49, 0 }, "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD" },
{ { 0, 50, 0 }, "Olympus Zuiko Digital ED 14-35mm F2.0 SWD" },
{ { 0, 51, 0 }, "Olympus Zuiko Digital 25mm F2.8" },
{ { 0, 52, 0 }, "Olympus Zuiko Digital ED 9-18mm F4.0-5.6" },
{ { 0, 53, 0 }, "Olympus Zuiko Digital 14-54mm F2.8-3.5 II" },
{ { 1, 1, 0 }, "Sigma 18-50mm F3.5-5.6 DC" },
{ { 1, 1, 16 }, "Sigma 30mm F2.8 EX DN" },
{ { 1, 2, 0 }, "Sigma 55-200mm F4.0-5.6 DC" },
{ { 1, 2, 16 }, "Sigma 19mm F2.8 EX DN" },
{ { 1, 3, 0 }, "Sigma 18-125mm F3.5-5.6 DC" },
{ { 1, 3, 16 }, "Sigma 30mm F2.8 DN | A" },
{ { 1, 4, 0 }, "Sigma 18-125mm F3.5-5.6" },
{ { 1, 4, 16 }, "Sigma 19mm F2.8 DN | A" },
{ { 1, 5, 0 }, "Sigma 30mm F1.4" },
{ { 1, 5, 16 }, "Sigma 60mm F2.8 DN | A" },
{ { 1, 6, 0 }, "Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF" },
{ { 1, 7, 0 }, "Sigma 105mm F2.8 DG" },
{ { 1, 8, 0 }, "Sigma 150mm F2.8 DG HSM" },
{ { 1, 9, 0 }, "Sigma 18-50mm F2.8 EX DC Macro" },
{ { 1, 16, 0 }, "Sigma 24mm F1.8 EX DG Aspherical Macro" },
{ { 1, 17, 0 }, "Sigma 135-400mm F4.5-5.6 DG ASP APO RF" },
{ { 1, 18, 0 }, "Sigma 300-800mm F5.6 EX DG APO" },
{ { 1, 19, 0 }, "Sigma 30mm F1.4 EX DC HSM" },
{ { 1, 20, 0 }, "Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF" },
{ { 1, 21, 0 }, "Sigma 10-20mm F4.0-5.6 EX DC HSM" },
{ { 1, 22, 0 }, "Sigma 70-200mm F2.8 EX DG Macro HSM II" },
{ { 1, 23, 0 }, "Sigma 50mm F1.4 EX DG HSM" },
{ { 2, 1, 0 }, "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph." },
{ { 2, 1, 16 }, "Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS" },
{ { 2, 2, 0 }, "Leica D Summilux 25mm F1.4 Asph." },
{ { 2, 2, 16 }, "Lumix G Vario 45-200mm F4.0-5.6 Mega OIS" },
{ { 2, 3, 0 }, "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph. Mega OIS" },
{ { 2, 3, 1 }, "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph." },
{ { 2, 3, 16 }, "Lumix G Vario HD 14-140mm F4.0-5.8 Asph. Mega OIS" },
{ { 2, 4, 0 }, "Leica D Vario Elmar 14-150mm F3.5-5.6" },
{ { 2, 4, 16 }, "Lumix G Vario 7-14mm F4.0 Asph." },
{ { 2, 5, 16 }, "Lumix G 20mm F1.7 Asph." },
{ { 2, 6, 16 }, "Leica DG Macro-Elmarit 45mm F2.8 Asph. Mega OIS" },
{ { 2, 7, 16 }, "Lumix G Vario 14-42mm F3.5-5.6 Asph. Mega OIS" },
{ { 2, 8, 16 }, "Lumix G Fisheye 8mm F3.5" },
{ { 2, 9, 16 }, "Lumix G Vario 100-300mm F4.0-5.6 Mega OIS" },
{ { 2, 16, 16 }, "Lumix G 14mm F2.5 Asph." },
{ { 2, 17, 16 }, "Lumix G 3D 12.5mm F12" },
{ { 2, 18, 16 }, "Leica DG Summilux 25mm F1.4 Asph." },
{ { 2, 19, 16 }, "Lumix G X Vario PZ 45-175mm F4.0-5.6 Asph. Power OIS" },
{ { 2, 20, 16 }, "Lumix G X Vario PZ 14-42mm F3.5-5.6 Asph. Power OIS" },
{ { 2, 21, 16 }, "Lumix G X Vario 12-35mm F2.8 Asph. Power OIS" },
{ { 2, 22, 16 }, "Lumix G Vario 45-150mm F4.0-5.6 Asph. Mega OIS" },
{ { 2, 23, 16 }, "Lumix G X Vario 35-100mm F2.8 Power OIS" },
{ { 2, 24, 16 }, "Lumix G Vario 14-42mm F3.5-5.6 II Asph. Mega OIS" },
{ { 2, 25, 16 }, "Lumix G Vario 14-140mm F3.5-5.6 Asph. Power OIS" },
{ { 2, 32, 16 }, "Lumix G Vario 12-32mm F3.5-5.6 Asph. Mega OIS" },
{ { 2, 33, 16 }, "Leica DG Nocticron 42.5mm F1.2 Asph. Power OIS" },
{ { 2, 34, 16 }, "Leica DG Summilux 15mm F1.7 Asph." },
{ { 3, 1, 0 }, "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph." },
{ { 3, 2, 0 }, "Leica D Summilux 25mm F1.4 Asph." },
{ { 5, 1, 16 }, "Tamron 14-150mm F3.5-5.8 Di III" },
// End of list marker
{ { 0xff, 0, 0 }, "" }
};
@ -1401,9 +1401,9 @@ namespace Exiv2 {
const char *label;
} extenderModels[] = {
{ { 0, 0 }, N_("None") },
{ { 0, 4 }, N_("Olympus Zuiko Digital EC-14 1.4x Teleconverter") },
{ { 0, 8 }, N_("Olympus EX-25 Extension Tube") },
{ { 0, 16 },N_("Olympus Zuiko Digital EC-20 2.0x Teleconverter") },
{ { 0, 4 }, "Olympus Zuiko Digital EC-14 1.4x Teleconverter" },
{ { 0, 8 }, "Olympus EX-25 Extension Tube" },
{ { 0, 16 },"Olympus Zuiko Digital EC-20 2.0x Teleconverter" },
// End of list marker
{ { 0xff, 0 }, "" }
};

6
src/panasonicmn.cpp
Unescape Escape View File

@ -234,9 +234,9 @@ namespace Exiv2 {
//! SelfTimer, tag 0x002e
extern const TagDetails panasonicSelfTimer[] = {
{ 1, N_("Off") },
{ 2, N_("10 s") },
{ 3, N_("2 s") },
{ 4, N_("10 s / 3 pictures") }
{ 2, "10 s" },
{ 3, "2 s" },
{ 4, "10 s / 3 pictures" }
};
//! Rotation, tag 0x0030

424
src/pentaxmn.cpp
Unescape Escape View File

@ -60,134 +60,134 @@ namespace Exiv2 {
//! CameraModel, tag 0x0005
extern const TagDetails pentaxModel[] = {
{ 0x0000d, N_("Optio 330/430") },
{ 0x12926, N_("Optio 230") },
{ 0x12958, N_("Optio 330GS") },
{ 0x12962, N_("Optio 450/550") },
{ 0x1296c, N_("Optio S") },
{ 0x12971, N_("Optio S V1.01") },
{ 0x12994, N_("*ist D") },
{ 0x129b2, N_("Optio 33L") },
{ 0x129bc, N_("Optio 33LF") },
{ 0x129c6, N_("Optio 33WR/43WR/555") },
{ 0x129d5, N_("Optio S4") },
{ 0x12a02, N_("Optio MX") },
{ 0x12a0c, N_("Optio S40") },
{ 0x12a16, N_("Optio S4i") },
{ 0x12a34, N_("Optio 30") },
{ 0x12a52, N_("Optio S30") },
{ 0x12a66, N_("Optio 750Z") },
{ 0x12a70, N_("Optio SV") },
{ 0x12a75, N_("Optio SVi") },
{ 0x12a7a, N_("Optio X") },
{ 0x12a8e, N_("Optio S5i") },
{ 0x12a98, N_("Optio S50") },
{ 0x12aa2, N_("*ist DS") },
{ 0x12ab6, N_("Optio MX4") },
{ 0x12ac0, N_("Optio S5n") },
{ 0x12aca, N_("Optio WP") },
{ 0x12afc, N_("Optio S55") },
{ 0x12b10, N_("Optio S5z") },
{ 0x12b1a, N_("*ist DL") },
{ 0x12b24, N_("Optio S60") },
{ 0x12b2e, N_("Optio S45") },
{ 0x12b38, N_("Optio S6") },
{ 0x12b4c, N_("Optio WPi") },
{ 0x12b56, N_("BenQ DC X600") },
{ 0x12b60, N_("*ist DS2") },
{ 0x12b62, N_("Samsung GX-1S") },
{ 0x12b6a, N_("Optio A10") },
{ 0x12b7e, N_("*ist DL2") },
{ 0x12b80, N_("Samsung GX-1L") },
{ 0x12b9c, N_("K100D") },
{ 0x12b9d, N_("K110D") },
{ 0x12ba2, N_("K100D Super") },
{ 0x12bb0, N_("Optio T10/T20") },
{ 0x12be2, N_("Optio W10") },
{ 0x12bf6, N_("Optio M10") },
{ 0x12c1e, N_("K10D") },
{ 0x12c20, N_("Samsung GX10") },
{ 0x12c28, N_("Optio S7") },
{ 0x12c2d, N_("Optio L20") },
{ 0x12c32, N_("Optio M20") },
{ 0x12c3c, N_("Optio W20") },
{ 0x12c46, N_("Optio A20") },
{ 0x12c78, N_("Optio E30") },
{ 0x12c7d, N_("Optio E35") },
{ 0x12c82, N_("Optio T30") },
{ 0x12c8c, N_("Optio M30") },
{ 0x12c91, N_("Optio L30") },
{ 0x12c96, N_("Optio W30") },
{ 0x12ca0, N_("Optio A30") },
{ 0x12cb4, N_("Optio E40") },
{ 0x12cbe, N_("Optio M40") },
{ 0x12cc3, N_("Optio L40") },
{ 0x12cc5, N_("Optio L36") },
{ 0x12cc8, N_("Optio Z10") },
{ 0x12cd2, N_("K20D") },
{ 0x12cd4, N_("Samsung GX20") },
{ 0x12cdc, N_("Optio S10") },
{ 0x12ce6, N_("Optio A40") },
{ 0x12cf0, N_("Optio V10") },
{ 0x12cfa, N_("K200D") },
{ 0x12d04, N_("Optio S12") },
{ 0x12d0e, N_("Optio E50") },
{ 0x12d18, N_("Optio M50") },
{ 0x12d22, N_("Optio L50") },
{ 0x12d2c, N_("Optio V20") },
{ 0x12d40, N_("Optio W60") },
{ 0x12d4a, N_("Optio M60") },
{ 0x12d68, N_("Optio E60/M90") },
{ 0x12d72, N_("K2000") },
{ 0x12d73, N_("K-m") },
{ 0x12d86, N_("Optio P70") },
{ 0x12d90, N_("Optio L70") },
{ 0x12d9a, N_("Optio E70") },
{ 0x12dae, N_("X70") },
{ 0x12db8, N_("K-7") },
{ 0x12dcc, N_("Optio W80") },
{ 0x12dea, N_("Optio P80") },
{ 0x12df4, N_("Optio WS80") },
{ 0x12dfe, N_("K-x") },
{ 0x12e08, N_("645D") },
{ 0x12e12, N_("Optio E80") },
{ 0x12e30, N_("Optio W90") },
{ 0x12e3a, N_("Optio I-10") },
{ 0x12e44, N_("Optio H90") },
{ 0x12e4e, N_("Optio E90") },
{ 0x12e58, N_("X90") },
{ 0x12e6c, N_("K-r") },
{ 0x12e76, N_("K-5") },
{ 0x12e8a, N_("Optio RS1000/RS1500") },
{ 0x12e94, N_("Optio RZ10") },
{ 0x12e9e, N_("Optio LS1000") },
{ 0x12ebc, N_("Optio WG-1 GPS") },
{ 0x12ed0, N_("Optio S1") },
{ 0x12ee4, N_("Q") },
{ 0x12ef8, N_("K-01") },
{ 0x12f0c, N_("Optio RZ18") },
{ 0x12f16, N_("Optio VS20") },
{ 0x12f2a, N_("Optio WG-2 GPS") },
{ 0x12f48, N_("Optio LS465") },
{ 0x12f52, N_("K-30") },
{ 0x12f5c, N_("X-5") },
{ 0x12f66, N_("Q10") },
{ 0x12f70, N_("K-5 II") },
{ 0x12f71, N_("K-5 II s") },
{ 0x12f7a, N_("Q7") },
{ 0x12f84, N_("MX-1") },
{ 0x12f8e, N_("WG-3 GPS") },
{ 0x12f98, N_("WG-3") },
{ 0x12fa2, N_("WG-10") },
{ 0x12fb6, N_("K-50") },
{ 0x12fc0, N_("K-3") },
{ 0x12fca, N_("K-500") },
{ 0x12fde, N_("WG-4 GPS") },
{ 0x12fe8, N_("WG-4") },
{ 0x13006, N_("WG-20") },
{ 0x13010, N_("645Z") },
{ 0x1301a, N_("K-S1") },
{ 0x1302e, N_("Q-S1") },
{ 0x0000d, "Optio 330/430" },
{ 0x12926, "Optio 230" },
{ 0x12958, "Optio 330GS" },
{ 0x12962, "Optio 450/550" },
{ 0x1296c, "Optio S" },
{ 0x12971, "Optio S V1.01" },
{ 0x12994, "*ist D" },
{ 0x129b2, "Optio 33L" },
{ 0x129bc, "Optio 33LF" },
{ 0x129c6, "Optio 33WR/43WR/555" },
{ 0x129d5, "Optio S4" },
{ 0x12a02, "Optio MX" },
{ 0x12a0c, "Optio S40" },
{ 0x12a16, "Optio S4i" },
{ 0x12a34, "Optio 30" },
{ 0x12a52, "Optio S30" },
{ 0x12a66, "Optio 750Z" },
{ 0x12a70, "Optio SV" },
{ 0x12a75, "Optio SVi" },
{ 0x12a7a, "Optio X" },
{ 0x12a8e, "Optio S5i" },
{ 0x12a98, "Optio S50" },
{ 0x12aa2, "*ist DS" },
{ 0x12ab6, "Optio MX4" },
{ 0x12ac0, "Optio S5n" },
{ 0x12aca, "Optio WP" },
{ 0x12afc, "Optio S55" },
{ 0x12b10, "Optio S5z" },
{ 0x12b1a, "*ist DL" },
{ 0x12b24, "Optio S60" },
{ 0x12b2e, "Optio S45" },
{ 0x12b38, "Optio S6" },
{ 0x12b4c, "Optio WPi" },
{ 0x12b56, "BenQ DC X600" },
{ 0x12b60, "*ist DS2" },
{ 0x12b62, "Samsung GX-1S" },
{ 0x12b6a, "Optio A10" },
{ 0x12b7e, "*ist DL2" },
{ 0x12b80, "Samsung GX-1L" },
{ 0x12b9c, "K100D" },
{ 0x12b9d, "K110D" },
{ 0x12ba2, "K100D Super" },
{ 0x12bb0, "Optio T10/T20" },
{ 0x12be2, "Optio W10" },
{ 0x12bf6, "Optio M10" },
{ 0x12c1e, "K10D" },
{ 0x12c20, "Samsung GX10" },
{ 0x12c28, "Optio S7" },
{ 0x12c2d, "Optio L20" },
{ 0x12c32, "Optio M20" },
{ 0x12c3c, "Optio W20" },
{ 0x12c46, "Optio A20" },
{ 0x12c78, "Optio E30" },
{ 0x12c7d, "Optio E35" },
{ 0x12c82, "Optio T30" },
{ 0x12c8c, "Optio M30" },
{ 0x12c91, "Optio L30" },
{ 0x12c96, "Optio W30" },
{ 0x12ca0, "Optio A30" },
{ 0x12cb4, "Optio E40" },
{ 0x12cbe, "Optio M40" },
{ 0x12cc3, "Optio L40" },
{ 0x12cc5, "Optio L36" },
{ 0x12cc8, "Optio Z10" },
{ 0x12cd2, "K20D" },
{ 0x12cd4, "Samsung GX20" },
{ 0x12cdc, "Optio S10" },
{ 0x12ce6, "Optio A40" },
{ 0x12cf0, "Optio V10" },
{ 0x12cfa, "K200D" },
{ 0x12d04, "Optio S12" },
{ 0x12d0e, "Optio E50" },
{ 0x12d18, "Optio M50" },
{ 0x12d22, "Optio L50" },
{ 0x12d2c, "Optio V20" },
{ 0x12d40, "Optio W60" },
{ 0x12d4a, "Optio M60" },
{ 0x12d68, "Optio E60/M90" },
{ 0x12d72, "K2000" },
{ 0x12d73, "K-m" },
{ 0x12d86, "Optio P70" },
{ 0x12d90, "Optio L70" },
{ 0x12d9a, "Optio E70" },
{ 0x12dae, "X70" },
{ 0x12db8, "K-7" },
{ 0x12dcc, "Optio W80" },
{ 0x12dea, "Optio P80" },
{ 0x12df4, "Optio WS80" },
{ 0x12dfe, "K-x" },
{ 0x12e08, "645D" },
{ 0x12e12, "Optio E80" },
{ 0x12e30, "Optio W90" },
{ 0x12e3a, "Optio I-10" },
{ 0x12e44, "Optio H90" },
{ 0x12e4e, "Optio E90" },
{ 0x12e58, "X90" },
{ 0x12e6c, "K-r" },
{ 0x12e76, "K-5" },
{ 0x12e8a, "Optio RS1000/RS1500" },
{ 0x12e94, "Optio RZ10" },
{ 0x12e9e, "Optio LS1000" },
{ 0x12ebc, "Optio WG-1 GPS" },
{ 0x12ed0, "Optio S1" },
{ 0x12ee4, "Q" },
{ 0x12ef8, "K-01" },
{ 0x12f0c, "Optio RZ18" },
{ 0x12f16, "Optio VS20" },
{ 0x12f2a, "Optio WG-2 GPS" },
{ 0x12f48, "Optio LS465" },
{ 0x12f52, "K-30" },
{ 0x12f5c, "X-5" },
{ 0x12f66, "Q10" },
{ 0x12f70, "K-5 II" },
{ 0x12f71, "K-5 II s" },
{ 0x12f7a, "Q7" },
{ 0x12f84, "MX-1" },
{ 0x12f8e, "WG-3 GPS" },
{ 0x12f98, "WG-3" },
{ 0x12fa2, "WG-10" },
{ 0x12fb6, "K-50" },
{ 0x12fc0, "K-3" },
{ 0x12fca, "K-500" },
{ 0x12fde, "WG-4 GPS" },
{ 0x12fe8, "WG-4" },
{ 0x13006, "WG-20" },
{ 0x13010, "645Z" },
{ 0x1301a, "K-S1" },
{ 0x1302e, "Q-S1" },
};
//! Quality, tag 0x0008
@ -203,28 +203,28 @@ namespace Exiv2 {
//! Size, tag 0x0009
extern const TagDetails pentaxSize[] = {
{ 0, N_("640x480") },
{ 0, "640x480" },
{ 1, N_("Full") },
{ 2, N_("1024x768") },
{ 3, N_("1280x960") },
{ 4, N_("1600x1200") },
{ 5, N_("2048x1536") },
{ 2, "1024x768" },
{ 3, "1280x960" },
{ 4, "1600x1200" },
{ 5, "2048x1536" },
{ 8, N_("2560x1920 or 2304x1728") },
{ 9, N_("3072x2304") },
{ 10, N_("3264x2448") },
{ 19, N_("320x240") },
{ 20, N_("2288x1712") },
{ 21, N_("2592x1944") },
{ 9, "3072x2304" },
{ 10, "3264x2448" },
{ 19, "320x240" },
{ 20, "2288x1712" },
{ 21, "2592x1944" },
{ 22, N_("2304x1728 or 2592x1944") },
{ 23, N_("3056x2296") },
{ 23, "3056x2296" },
{ 25, N_("2816x2212 or 2816x2112") },
{ 27, N_("3648x2736") },
{ 29, N_("4000x3000") },
{ 30, N_("4288x3216") },
{ 31, N_("4608x3456") },
{ 129, N_("1920x1080") },
{ 135, N_("4608x2592") },
{ 257, N_("3216x3216") },
{ 27, "3648x2736" },
{ 29, "4000x3000" },
{ 30, "4288x3216" },
{ 31, "4608x3456" },
{ 129, "1920x1080" },
{ 135, "4608x2592" },
{ 257, "3216x3216" },
// not sure what to do with these values:
// '0 0' = 2304x1728
// '4 0' = 1600x1200
@ -312,72 +312,72 @@ namespace Exiv2 {
//! ISO, tag 0x0014
extern const TagDetails pentaxISO[] = {
{ 3, N_("50") },
{ 4, N_("64") },
{ 5, N_("80") },
{ 6, N_("100") },
{ 7, N_("125") },
{ 8, N_("160") },
{ 9, N_("200") },
{ 10, N_("250") },
{ 11, N_("320") },
{ 12, N_("400") },
{ 13, N_("500") },
{ 14, N_("640") },
{ 15, N_("800") },
{ 16, N_("1000") },
{ 17, N_("1250") },
{ 18, N_("1600") },
{ 19, N_("2000") },
{ 20, N_("2500") },
{ 21, N_("3200") },
{ 22, N_("4000") },
{ 23, N_("5000") },
{ 24, N_("6400") },
{ 25, N_("8000") },
{ 26, N_("10000") },
{ 27, N_("12800") },
{ 28, N_("16000") },
{ 29, N_("20000") },
{ 30, N_("25600") },
{ 31, N_("32000") },
{ 32, N_("40000") },
{ 33, N_("51200") },
{ 34, N_("64000") },
{ 35, N_("80000") },
{ 36, N_("102400") },
{ 37, N_("128000") },
{ 38, N_("160000") },
{ 39, N_("204800") },
{ 50, N_("50") },
{ 100, N_("100") },
{ 200, N_("200") },
// { 268, N_("200") },
{ 400, N_("400") },
{ 800, N_("800") },
{ 1600, N_("1600") },
{ 3200, N_("3200") },
{ 258, N_("50") },
{ 259, N_("70") },
{ 260, N_("100") },
{ 261, N_("140") },
{ 262, N_("200") },
{ 263, N_("280") },
{ 264, N_("400") },
{ 265, N_("560") },
{ 266, N_("800") },
{ 267, N_("1100") },
{ 268, N_("1600") },
{ 269, N_("2200") },
{ 270, N_("3200") },
{ 271, N_("4500") },
{ 272, N_("6400") },
{ 273, N_("9000") },
{ 274, N_("12800") },
{ 275, N_("18000") },
{ 276, N_("25600") },
{ 277, N_("36000") },
{ 278, N_("51200") },
{ 3, "50" },
{ 4, "64" },
{ 5, "80" },
{ 6, "100" },
{ 7, "125" },
{ 8, "160" },
{ 9, "200" },
{ 10, "250" },
{ 11, "320" },
{ 12, "400" },
{ 13, "500" },
{ 14, "640" },
{ 15, "800" },
{ 16, "1000" },
{ 17, "1250" },
{ 18, "1600" },
{ 19, "2000" },
{ 20, "2500" },
{ 21, "3200" },
{ 22, "4000" },
{ 23, "5000" },
{ 24, "6400" },
{ 25, "8000" },
{ 26, "10000" },
{ 27, "12800" },
{ 28, "16000" },
{ 29, "20000" },
{ 30, "25600" },
{ 31, "32000" },
{ 32, "40000" },
{ 33, "51200" },
{ 34, "64000" },
{ 35, "80000" },
{ 36, "102400" },
{ 37, "128000" },
{ 38, "160000" },
{ 39, "204800" },
{ 50, "50" },
{ 100, "100" },
{ 200, "200" },
// { 268, "200" },
{ 400, "400" },
{ 800, "800" },
{ 1600, "1600" },
{ 3200, "3200" },
{ 258, "50" },
{ 259, "70" },
{ 260, "100" },
{ 261, "140" },
{ 262, "200" },
{ 263, "280" },
{ 264, "400" },
{ 265, "560" },
{ 266, "800" },
{ 267, "1100" },
{ 268, "1600" },
{ 269, "2200" },
{ 270, "3200" },
{ 271, "4500" },
{ 272, "6400" },
{ 273, "9000" },
{ 274, "12800" },
{ 275, "18000" },
{ 276, "25600" },
{ 277, "36000" },
{ 278, "51200" },
};

32
src/samsungmn.cpp
Unescape Escape View File

@ -51,22 +51,22 @@ namespace Exiv2 {
//! LensType, tag 0xa003
extern const TagDetails samsung2LensType[] = {
{ 0, N_("Built-in") },
{ 1, N_("Samsung NX 30mm F2 Pancake") },
{ 2, N_("Samsung NX 18-55mm F3.5-5.6 OIS") },
{ 3, N_("Samsung NX 50-200mm F4-5.6 ED OIS") },
{ 4, N_("Samsung NX 20-50mm F3.5-5.6 ED") },
{ 5, N_("Samsung NX 20mm F2.8 Pancake") },
{ 6, N_("Samsung NX 18-200mm F3.5-6.3 ED OIS") },
{ 7, N_("Samsung NX 60mm F2.8 Macro ED OIS SSA") },
{ 8, N_("Samsung NX 16mm F2.4 Pancake") },
{ 9, N_("Samsung NX 85mm F1.4 ED SSA") },
{ 10, N_("Samsung NX 45mm F1.8") },
{ 11, N_("Samsung NX 45mm F1.8 2D/3D") },
{ 12, N_("Samsung NX 12-24mm F4-5.6 ED") },
{ 13, N_("Saumsun NX 16-50mm F2-2.8 S ED OIS") },
{ 14, N_("Samsung NX 10mm F3.5 Fisheye") },
{ 15, N_("Samsung NX 16-50mm F3.5-5.6 Power Zoom ED OIS") },
{ 20, N_("Samsung NX 50-150mm F2.8 S ED OIS") }
{ 1, "Samsung NX 30mm F2 Pancake" },
{ 2, "Samsung NX 18-55mm F3.5-5.6 OIS" },
{ 3, "Samsung NX 50-200mm F4-5.6 ED OIS" },
{ 4, "Samsung NX 20-50mm F3.5-5.6 ED" },
{ 5, "Samsung NX 20mm F2.8 Pancake" },
{ 6, "Samsung NX 18-200mm F3.5-6.3 ED OIS" },
{ 7, "Samsung NX 60mm F2.8 Macro ED OIS SSA" },
{ 8, "Samsung NX 16mm F2.4 Pancake" },
{ 9, "Samsung NX 85mm F1.4 ED SSA" },
{ 10, "Samsung NX 45mm F1.8" },
{ 11, "Samsung NX 45mm F1.8 2D/3D" },
{ 12, "Samsung NX 12-24mm F4-5.6 ED" },
{ 13, "Saumsun NX 16-50mm F2-2.8 S ED OIS" },
{ 14, "Samsung NX 10mm F3.5 Fisheye" },
{ 15, "Samsung NX 16-50mm F3.5-5.6 Power Zoom ED OIS" },
{ 20, "Samsung NX 50-150mm F2.8 S ED OIS" }
};
//! ColorSpace, tag 0xa011

Write Preview
Loading…
Cancel
Save