liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated all Canon interpreters.

Browse Source
This commit is contained in:
Morgan Hardwood
2016-07-01 17:31:18 +02:00
parent 0189a99e1c
commit 9edec3361b
1 changed files with 230 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

281
rtexif/canonattribs.cc
View File

@@ -149,6 +149,9 @@ public:
choices[3] = "Continuous, Speed Priority";
choices[4] = "Continuous, Low";
choices[5] = "Continuous, High";
choices[6] = "Silent Single";
choices[9] = "Single, Silent";
choices[10] = "Continuous, Silent";
}
};
CAContinuousDriveInterpreter caContinuousDriveInterpreter;
@@ -161,11 +164,13 @@ public:
choices[0] = "One-shot AF";
choices[1] = "AI Servo AF";
choices[2] = "AI Focus AF";
choices[3] = "Manual Focus";
choices[3] = "Manual Focus (3)";
choices[4] = "Single";
choices[5] = "Continuous";
choices[6] = "Manual Focus";
choices[6] = "Manual Focus (6)";
choices[16] = "Pan Focus";
choices[256] = "AF + MF";
choices[512] = "Movie Snap Focus";
}
};
CAFocusModeInterpreter caFocusModeInterpreter;
@@ -182,7 +187,8 @@ public:
choices[5] = "TIF+JPEG";
choices[6] = "CR2";
choices[7] = "CR2+JPEG";
choices[9] = "Video";
choices[9] = "MOV";
choices[10] = "MP4";
}
};
CARecordModeInterpreter caRecordModeInterpreter;
@@ -201,6 +207,9 @@ public:
choices[8] = "Postcard";
choices[9] = "Widescreen";
choices[10] = "Medium Widescreen";
choices[14] = "Small 1";
choices[15] = "Small 2";
choices[16] = "Small 3";
choices[128] = "640x480 Movie";
choices[129] = "Medium Movie";
choices[130] = "Small Movie";
@@ -215,17 +224,17 @@ class CAEasyModeInterpreter : public ChoiceInterpreter
public:
CAEasyModeInterpreter ()
{
choices[0] = "Full auto ";
choices[1] = "Manual ";
choices[2] = "Landscape ";
choices[3] = "Fast shutter ";
choices[4] = "Slow shutter ";
choices[5] = "Night ";
choices[6] = "Gray Scale ";
choices[7] = "Sepia ";
choices[8] = "Portrait ";
choices[9] = "Sports ";
choices[10] = "Macro ";
choices[0] = "Full auto";
choices[1] = "Manual";
choices[2] = "Landscape";
choices[3] = "Fast shutter";
choices[4] = "Slow shutter";
choices[5] = "Night";
choices[6] = "Gray Scale";
choices[7] = "Sepia";
choices[8] = "Portrait";
choices[9] = "Sports";
choices[10] = "Macro";
choices[11] = "Black & White";
choices[12] = "Pan focus";
choices[13] = "Vivid";
@@ -243,17 +252,49 @@ public:
choices[25] = "Night Snapshot";
choices[26] = "Digital Macro";
choices[27] = "My Colors";
choices[28] = "Still Image";
choices[28] = "Movie Snap";
choices[29] = "Super Macro 2";
choices[30] = "Color Accent";
choices[31] = "Color Swap";
choices[32] = "Aquarium";
choices[33] = "ISO 3200";
choices[34] = "ISO 6400";
choices[35] = "Creative Light Effect";
choices[36] = "Easy";
choices[37] = "Quick Shot";
choices[38] = "Creative Auto";
choices[39] = "Zoom Blur";
choices[40] = "Low Light";
choices[41] = "Nostalgic";
choices[42] = "Super Vivid";
choices[43] = "Poster";
choices[47] = "Fisheye";
choices[48] = "Miniature";
choices[43] = "Poster Effect";
choices[44] = "Face Self-timer";
choices[45] = "Smile";
choices[46] = "Wink Self-timer";
choices[47] = "Fisheye Effect";
choices[48] = "Miniature Effect";
choices[49] = "High-speed Burst";
choices[50] = "Best Image Selection";
choices[51] = "High Dynamic Range";
choices[52] = "Handheld Night Scene";
choices[53] = "Movie Digest";
choices[54] = "Live View Control";
choices[55] = "Discreet";
choices[56] = "Blur Reduction";
choices[57] = "Monochrome";
choices[58] = "Toy Camera Effect";
choices[59] = "Scene Intelligent Auto";
choices[60] = "High-speed Burst HQ";
choices[61] = "Smooth Skin";
choices[62] = "Soft Focus";
choices[257] = "Spotlight";
choices[258] = "Night 2";
choices[259] = "Night+";
choices[260] = "Super Night";
choices[261] = "Sunset";
choices[263] = "Night Scene";
choices[264] = "Surface";
choices[265] = "Low Light 2";
}
};
CAEasyModeInterpreter caEasyModeInterpreter;
@@ -281,7 +322,7 @@ public:
choices[2] = "Average";
choices[3] = "Evaluative";
choices[4] = "Partial";
choices[5] = "Center-weighted averaging";
choices[5] = "Center-weighted average";
}
};
CAMeteringModeInterpreter caMeteringModeInterpreter;
@@ -422,9 +463,14 @@ public:
{
choices[0] = "Off";
choices[1] = "On";
choices[2] = "On, Shot Only";
choices[3] = "On, Panning";
choices[4] = "On, Video";
choices[2] = "Shoot Only";
choices[3] = "Panning";
choices[4] = "Dynamic";
choices[256] = "Off (2)";
choices[257] = "On (2)";
choices[258] = "Shoot Only (2)";
choices[259] = "Panning (2)";
choices[260] = "Dynamic (2)";
}
};
CAStabilizationInterpreter caStabilizationInterpreter;
@@ -986,7 +1032,7 @@ class CAFocalTypeInterpreter : public ChoiceInterpreter
public:
CAFocalTypeInterpreter()
{
choices[0] = "undef";
choices[0] = "Fixed";
choices[1] = "Fixed";
choices[2] = "Zoom";
}
@@ -1119,6 +1165,11 @@ public:
choices[15] = "Custom 1";
choices[16] = "Custom 2";
choices[17] = "Underwater";
choices[18] = "Custom 3";
choices[19] = "Custom 4";
choices[20] = "PC Set4";
choices[21] = "PC Set5";
choices[23] = "Auto (ambience priority)";
}
};
CAWhiteBalanceInterpreter caWhiteBalanceInterpreter;
@@ -1136,15 +1187,17 @@ public:
choices[0x21] = "User Def. 1";
choices[0x22] = "User Def. 2";
choices[0x23] = "User Def. 3";
choices[0x41] = "External 1";
choices[0x42] = "External 2";
choices[0x43] = "External 3";
choices[0x41] = "PC 1";
choices[0x42] = "PC 2";
choices[0x43] = "PC 3";
choices[0x81] = "Standard";
choices[0x82] = "Portrait";
choices[0x83] = "Landscape";
choices[0x84] = "Neutral";
choices[0x85] = "Faithful";
choices[0x86] = "Monochrome";
choices[0x87] = "Auto";
choices[0x88] = "Fine Detail";
}
};
CAPictureStyleInterpreter caPictureStyleInterpreter;
@@ -1298,6 +1351,8 @@ public:
choices[3] = "Fine";
choices[4] = "RAW";
choices[5] = "Superfine";
choices[130] = "Normal Movie";
choices[131] = "Movie (2)";
}
};
CARAWJpegQualityInterpreter caRAWJpegQualityInterpreter;
@@ -1315,6 +1370,15 @@ public:
choices[7] = "Medium 3";
choices[8] = "Postcard";
choices[9] = "Widescreen";
choices[10] = "Medium Widescreen";
choices[14] = "Small 1";
choices[15] = "Small 2";
choices[16] = "Small 3";
choices[128] = "640x480 Movie";
choices[129] = "Medium Movie";
choices[130] = "Small Movie";
choices[137] = "1280x720 Movie";
choices[142] = "1920x1080 Movie";
}
};
CAJpegSizeInterpreter caJpegSizeInterpreter;
@@ -1325,8 +1389,8 @@ public:
CAWBBracketModeInterpreter()
{
choices[0] = "Off";
choices[1] = "Shift AB";
choices[2] = "shift GM";
choices[1] = "On (shift AB)";
choices[2] = "On (shift GM)";
}
};
CAWBBracketModeInterpreter caWBBracketModeInterpreter;
@@ -1422,10 +1486,10 @@ public:
choices[0x1570000] = "PowerShot A510";
choices[0x1590000] = "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2";
choices[0x1640000] = "PowerShot S2 IS";
choices[0x1650000] = "PowerShot SD430 / IXUS Wireless / IXY Wireless";
choices[0x1650000] = "PowerShot SD430 / Digital IXUS Wireless / IXY Digital Wireless";
choices[0x1660000] = "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600";
choices[0x1668000] = "EOS D60";
choices[0x1700000] = "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3";
choices[0x1700000] = "PowerShot SD30 / Digital IXUS i Zoom / IXY Digital L3";
choices[0x1740000] = "PowerShot A430";
choices[0x1750000] = "PowerShot A410";
choices[0x1760000] = "PowerShot S80";
@@ -1498,7 +1562,7 @@ public:
choices[0x2770000] = "PowerShot SD940 IS / Digital IXUS 120 IS / IXY Digital 220 IS";
choices[0x2800000] = "PowerShot A495";
choices[0x2810000] = "PowerShot A490";
choices[0x2820000] = "PowerShot A3100 IS";
choices[0x2820000] = "PowerShot A3100 IS / A3150 IS";
choices[0x2830000] = "PowerShot A3000 IS";
choices[0x2840000] = "PowerShot SD1400 IS / IXUS 130 / IXY 400F";
choices[0x2850000] = "PowerShot SD1300 IS / IXUS 105 / IXY 200F";
@@ -1510,36 +1574,125 @@ public:
choices[0x2930000] = "PowerShot SX30 IS";
choices[0x2940000] = "PowerShot SX130 IS";
choices[0x2950000] = "PowerShot S95";
choices[0x2980000] = "PowerShot A3300 IS";
choices[0x2990000] = "PowerShot A3200 IS";
choices[0x3000000] = "PowerShot ELPH 500 HS / IXUS 310 HS / IXY 31S";
choices[0x3010000] = "PowerShot Pro90 IS";
choices[0x3340000] = "PowerShot SX50 HS";
choices[0x3360000] = "PowerShot S110";
choices[0x3010001] = "PowerShot A800";
choices[0x3020000] = "PowerShot ELPH 100 HS / IXUS 115 HS / IXY 210F";
choices[0x3030000] = "PowerShot SX230 HS";
choices[0x3040000] = "PowerShot ELPH 300 HS / IXUS 220 HS / IXY 410F";
choices[0x3050000] = "PowerShot A2200";
choices[0x3060000] = "PowerShot A1200";
choices[0x3070000] = "PowerShot SX220 HS";
choices[0x3080000] = "PowerShot G1 X";
choices[0x3090000] = "PowerShot SX150 IS";
choices[0x3100000] = "PowerShot ELPH 510 HS / IXUS 1100 HS / IXY 51S";
choices[0x3110000] = "PowerShot S100 (new)";
choices[0x3120000] = "PowerShot ELPH 310 HS / IXUS 230 HS / IXY 600F";
choices[0x3130000] = "PowerShot SX40 HS";
choices[0x3140000] = "IXY 32S";
choices[0x3160000] = "PowerShot A1300";
choices[0x3170000] = "PowerShot A810";
choices[0x3180000] = "PowerShot ELPH 320 HS / IXUS 240 HS / IXY 420F";
choices[0x3190000] = "PowerShot ELPH 110 HS / IXUS 125 HS / IXY 220F";
choices[0x3200000] = "PowerShot D20";
choices[0x3210000] = "PowerShot A4000 IS";
choices[0x3220000] = "PowerShot SX260 HS";
choices[0x3230000] = "PowerShot SX240 HS";
choices[0x3240000] = "PowerShot ELPH 530 HS / IXUS 510 HS / IXY 1";
choices[0x3250000] = "PowerShot ELPH 520 HS / IXUS 500 HS / IXY 3";
choices[0x3260000] = "PowerShot A3400 IS";
choices[0x3270000] = "PowerShot A2400 IS";
choices[0x3280000] = "PowerShot A2300";
choices[0x3330000] = "PowerShot G15";
choices[0x3340000] = "PowerShot SX50";
choices[0x3350000] = "PowerShot SX160 IS";
choices[0x3360000] = "PowerShot S110 (new)";
choices[0x3370000] = "PowerShot SX500 IS";
choices[0x3380000] = "PowerShot N";
choices[0x3390000] = "IXUS 245 HS / IXY 430F";
choices[0x3400000] = "PowerShot SX280 HS";
choices[0x3410000] = "PowerShot SX270 HS";
choices[0x3420000] = "PowerShot A3500 IS";
choices[0x3430000] = "PowerShot A2600";
choices[0x3450000] = "PowerShot A1400";
choices[0x3460000] = "PowerShot ELPH 130 IS / IXUS 140 / IXY 110F";
choices[0x3470000] = "PowerShot ELPH 115/120 IS / IXUS 132/135 / IXY 90F/100F";
choices[0x3490000] = "PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F";
choices[0x3510000] = "PowerShot A2500";
choices[0x3540000] = "PowerShot G16";
choices[0x3550000] = "PowerShot S120";
choices[0x3560000] = "PowerShot SX170 IS";
choices[0x3580000] = "PowerShot SX510 HS";
choices[0x3590000] = "PowerShot S200 (new)";
choices[0x3600000] = "IXY 620F";
choices[0x3610000] = "PowerShot N100";
choices[0x3640000] = "PowerShot G1 X Mark II";
choices[0x3650000] = "PowerShot D30";
choices[0x3660000] = "PowerShot SX700 HS";
choices[0x3670000] = "PowerShot SX600 HS";
choices[0x3680000] = "PowerShot ELPH 140 IS / IXUS 150 / IXY 130";
choices[0x3690000] = "PowerShot ELPH 135 / IXUS 145 / IXY 120";
choices[0x3700000] = "PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630";
choices[0x3710000] = "PowerShot ELPH 150 IS / IXUS 155 / IXY 140";
choices[0x3740000] = "EOS M3";
choices[0x3750000] = "PowerShot SX60 HS";
choices[0x3760000] = "PowerShot SX520 HS";
choices[0x3770000] = "PowerShot SX400 IS";
choices[0x3780000] = "PowerShot G7 X";
choices[0x3790000] = "PowerShot N2";
choices[0x3800000] = "PowerShot SX530 HS";
choices[0x3820000] = "PowerShot SX710 HS";
choices[0x3830000] = "PowerShot SX610 HS";
choices[0x3840000] = "EOS M10";
choices[0x3850000] = "PowerShot G3 X";
choices[0x3860000] = "PowerShot ELPH 165 HS / IXUS 165 / IXY 160";
choices[0x3870000] = "PowerShot ELPH 160 / IXUS 160";
choices[0x3880000] = "PowerShot ELPH 350 HS / IXUS 275 HS / IXY 640";
choices[0x3890000] = "PowerShot ELPH 170 IS / IXUS 170";
choices[0x3910000] = "PowerShot SX410 IS";
choices[0x3930000] = "PowerShot G9 X";
choices[0x3950000] = "PowerShot G5 X";
choices[0x3970000] = "PowerShot G7 X Mark II";
choices[0x3990000] = "PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650";
choices[0x4010000] = "PowerShot SX540 HS";
choices[0x4020000] = "PowerShot SX420 IS";
choices[0x4030000] = "PowerShot ELPH 190 IS / IXUS 180 / IXY 190";
choices[0x4040000] = "PowerShot G1";
choices[0x4040001] = "IXY 180";
choices[0x4050000] = "PowerShot SX720 HS";
choices[0x6040000] = "PowerShot S100 / Digital IXUS / IXY Digital";
choices[0x4007d673] = "DC19 / DC21 / DC22";
choices[0x4007d673] = "DC19/DC21/DC22";
choices[0x4007d674] = "XH A1";
choices[0x4007d675] = "HV10";
choices[0x4007d676] = "MD130 / MD140 / MD150 / MD160";
choices[0x4007d777] = "iVIS DC50";
choices[0x4007d778] = "iVIS HV20";
choices[0x4007d676] = "MD130/MD140/MD150/MD160/ZR850";
choices[0x4007d777] = "DC50";
choices[0x4007d778] = "HV20";
choices[0x4007d779] = "DC211";
choices[0x4007d77a] = "HG10";
choices[0x4007d77b] = "iVIS HR10";
choices[0x4007d77b] = "HR10";
choices[0x4007d77d] = "MD255/ZR950";
choices[0x4007d81c] = "HF11";
choices[0x4007d878] = "HV30";
choices[0x4007d87e] = "DC301 / DC310 / DC311 / DC320 / DC330";
choices[0x4007d87c] = "XH A1S";
choices[0x4007d87e] = "DC301/DC310/DC311/DC320/DC330";
choices[0x4007d87f] = "FS100";
choices[0x4007d880] = "iVIS HF10";
choices[0x4007d882] = "HG20 / HG21 / VIXIA HG21";
choices[0x4007d925] = "LEGRIA HF21";
choices[0x4007d978] = "LEGRIA HV40";
choices[0x4007d987] = "DC410 / DC420";
choices[0x4007d988] = "LEGRIA FS19 / FS20 / FS21 / FS22 / FS200";
choices[0x4007d989] = "LEGRIA HF20 / HF200";
choices[0x4007d98a] = "VIXIA HF S10 / S100";
choices[0x4007da8e] = "LEGRIA HF R16 / R17 / R106";
choices[0x4007da90] = "LEGRIA HF S21 / VIXIA HF S200";
choices[0x4007da92] = "LEGRIA FS36 / FS305 / FS306 / FS307";
choices[0x4007d880] = "HF10";
choices[0x4007d882] = "HG20/HG21";
choices[0x4007d925] = "HF21";
choices[0x4007d926] = "HF S11";
choices[0x4007d978] = "HV40";
choices[0x4007d987] = "DC410/DC411/DC420";
choices[0x4007d988] = "FS19/FS20/FS21/FS22/FS200";
choices[0x4007d989] = "HF20/HF200";
choices[0x4007d98a] = "HF S10/S100";
choices[0x4007da8e] = "HF R10/R16/R17/R18/R100/R106";
choices[0x4007da8f] = "HF M30/M31/M36/M300/M306";
choices[0x4007da90] = "HF S20/S21/S200";
choices[0x4007da92] = "FS31/FS36/FS37/FS300/FS305/FS306/FS307";
choices[0x4007dda9] = "HF G25";
choices[0x4007dfb4] = "XC10";
choices[0x80000001] = "EOS-1D";
choices[0x80000167] = "EOS-1DS";
choices[0x80000168] = "EOS 10D";
@@ -1554,19 +1707,44 @@ public:
choices[0x80000213] = "EOS 5D";
choices[0x80000215] = "EOS-1Ds Mark III";
choices[0x80000218] = "EOS 5D Mark II";
choices[0x80000219] = "WFT-E1";
choices[0x80000232] = "EOS-1D Mark II N";
choices[0x80000234] = "EOS 30D";
choices[0x80000236] = "EOS Digital Rebel XTi / 400D / Kiss Digital X";
choices[0x80000241] = "WFT-E2";
choices[0x80000246] = "WFT-E3";
choices[0x80000250] = "EOS 7D";
choices[0x80000252] = "EOS Rebel T1i / 500D / Kiss X3";
choices[0x80000254] = "EOS Rebel XS / 1000D / Kiss F";
choices[0x80000261] = "EOS 50D";
choices[0x80000269] = "EOS-1D X";
choices[0x80000270] = "EOS Rebel T2i / 550D / Kiss X4";
choices[0x80000271] = "WFT-E4";
choices[0x80000273] = "WFT-E5";
choices[0x80000281] = "EOS-1D Mark IV";
choices[0x80000285] = "EOS 5D Mark III";
choices[0x80000286] = "EOS 600D";
choices[0x80000286] = "EOS Rebel T3i / 600D / Kiss X5";
choices[0x80000287] = "EOS 60D";
choices[0x80000288] = "EOS Rebel T3 / 1100D / Kiss X50";
choices[0x80000289] = "EOS 7D Mark II";
choices[0x80000297] = "WFT-E2 II";
choices[0x80000298] = "WFT-E4 II";
choices[0x80000301] = "EOS Rebel T4i / 650D / Kiss X6i";
choices[0x80000302] = "EOS 6D";
choices[0x80000324] = "EOS-1D C";
choices[0x80000325] = "EOS 70D";
choices[0x80000326] = "EOS Rebel T5i / 700D / Kiss X7i";
choices[0x80000327] = "EOS Rebel T5 / 1200D / Kiss X70";
choices[0x80000328] = "EOS-1D X MARK II";
choices[0x80000331] = "EOS M";
choices[0x80000346] = "EOS Rebel SL1 / 100D / Kiss X7";
choices[0x80000347] = "EOS Rebel T6s / 760D / 8000D";
choices[0x80000350] = "EOS 80D";
choices[0x80000355] = "EOS M2";
choices[0x80000382] = "EOS 5DS";
choices[0x80000393] = "EOS Rebel T6i / 750D / Kiss X8i";
choices[0x80000401] = "EOS 5DS R";
choices[0x80000404] = "EOS Rebel T6 / 1300D / Kiss X80";
}
};
CAModelIDInterpreter caModelIDInterpreter;
@@ -1594,6 +1772,7 @@ public:
choices[1] = "1:1";
choices[2] = "4:3";
choices[7] = "16:9";
choices[8] = "4:5";
}
};