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

Second batch of correction to lower the number of GCC warnings

Browse Source
This commit is contained in:
Hombre
2010-08-30 01:07:43 +02:00
parent 02dac0425d
commit 76285ea74d
20 changed files with 288 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
rtexif/fujiattribs.cc
View File

@@ -222,42 +222,42 @@ FAPictureModeInterpreter faPictureModeInterpreter;
const TagAttrib fujiAttribs[] = {
0, 1, 0, 0, 0x0000, "Version", &stdInterpreter,
0, 1, 0, 0, 0x0010, "InternalSerialNumber", &stdInterpreter,
0, 1, 0, 0, 0x1000, "Quality", &stdInterpreter,
0, 1, 0, 0, 0x1001, "Sharpness", &faSharpnessInterpreter,
0, 1, 0, 0, 0x1002, "WhiteBalance", &faWhiteBalanceInterpreter,
0, 1, 0, 0, 0x1003, "Saturation", &faSaturationInterpreter,
0, 1, 0, 0, 0x1004, "Contrast", &faContrastInterpreter,
0, 1, 0, 0, 0x1005, "ColorTemperature", &stdInterpreter,
0, 1, 0, 0, 0x1006, "Contrast2", &faContrast2Interpreter,
0, 1, 0, 0, 0x100a, "WhiteBalanceFineTune", &stdInterpreter,
0, 1, 0, 0, 0x100b, "NoiseReduction", &faNoiseReductionInterpreter,
0, 1, 0, 0, 0x100b, "FujiFlashMode", &faFlashInterpreter,
0, 1, 0, 0, 0x1011, "FlashExposureComp", &stdInterpreter,
0, 1, 0, 0, 0x1020, "Macro", &faOnOffInterpreter,
0, 1, 0, 0, 0x1021, "FocusMode", &faFocusModeInterpreter,
0, 1, 0, 0, 0x1023, "FocusPixel", &stdInterpreter,
0, 1, 0, 0, 0x1030, "SlowSync", &faOnOffInterpreter,
0, 1, 0, 0, 0x1031, "PictureMode", &faPictureModeInterpreter,
0, 1, 0, 0, 0x1100, "AutoBracketing", &faOnOffInterpreter,
0, 1, 0, 0, 0x1101, "SequenceNumber", &stdInterpreter,
0, 1, 0, 0, 0x1210, "ColorMode", &faColorModeInterpreter,
0, 1, 0, 0, 0x1300, "BlurWarning", &faOnOffInterpreter,
0, 1, 0, 0, 0x1301, "FocusWarning", &faOnOffInterpreter,
0, 1, 0, 0, 0x1302, "ExposureWarning", &faOnOffInterpreter,
0, 1, 0, 0, 0x1400, "DynamicRange", &faDynamicRangeInterpreter,
0, 1, 0, 0, 0x1401, "FilmMode", &faFilmModeInterpreter,
0, 1, 0, 0, 0x1402, "DynamicRangeSetting", &faDRSettingInterpreter,
0, 1, 0, 0, 0x1403, "DevelopmentDynamicRange", &stdInterpreter,
0, 1, 0, 0, 0x1404, "MinFocalLength", &stdInterpreter,
0, 1, 0, 0, 0x1405, "MaxFocalLength", &stdInterpreter,
0, 1, 0, 0, 0x1406, "MaxApertureAtMinFocal", &stdInterpreter,
0, 1, 0, 0, 0x1407, "MaxApertureAtMaxFocal", &stdInterpreter,
0, 1, 0, 0, 0x8000, "FileSource", &stdInterpreter,
0, 1, 0, 0, 0x8002, "OrderNumber", &stdInterpreter,
0, 1, 0, 0, 0x8003, "FrameNumber", &stdInterpreter,
-1, 0, 0, 0, 0, "", NULL};
{0, 1, 0, 0, 0x0000, "Version", &stdInterpreter},
{0, 1, 0, 0, 0x0010, "InternalSerialNumber", &stdInterpreter},
{0, 1, 0, 0, 0x1000, "Quality", &stdInterpreter},
{0, 1, 0, 0, 0x1001, "Sharpness", &faSharpnessInterpreter},
{0, 1, 0, 0, 0x1002, "WhiteBalance", &faWhiteBalanceInterpreter},
{0, 1, 0, 0, 0x1003, "Saturation", &faSaturationInterpreter},
{0, 1, 0, 0, 0x1004, "Contrast", &faContrastInterpreter},
{0, 1, 0, 0, 0x1005, "ColorTemperature", &stdInterpreter},
{0, 1, 0, 0, 0x1006, "Contrast2", &faContrast2Interpreter},
{0, 1, 0, 0, 0x100a, "WhiteBalanceFineTune", &stdInterpreter},
{0, 1, 0, 0, 0x100b, "NoiseReduction", &faNoiseReductionInterpreter},
{0, 1, 0, 0, 0x100b, "FujiFlashMode", &faFlashInterpreter},
{0, 1, 0, 0, 0x1011, "FlashExposureComp", &stdInterpreter},
{0, 1, 0, 0, 0x1020, "Macro", &faOnOffInterpreter},
{0, 1, 0, 0, 0x1021, "FocusMode", &faFocusModeInterpreter},
{0, 1, 0, 0, 0x1023, "FocusPixel", &stdInterpreter},
{0, 1, 0, 0, 0x1030, "SlowSync", &faOnOffInterpreter},
{0, 1, 0, 0, 0x1031, "PictureMode", &faPictureModeInterpreter},
{0, 1, 0, 0, 0x1100, "AutoBracketing", &faOnOffInterpreter},
{0, 1, 0, 0, 0x1101, "SequenceNumber", &stdInterpreter},
{0, 1, 0, 0, 0x1210, "ColorMode", &faColorModeInterpreter},
{0, 1, 0, 0, 0x1300, "BlurWarning", &faOnOffInterpreter},
{0, 1, 0, 0, 0x1301, "FocusWarning", &faOnOffInterpreter},
{0, 1, 0, 0, 0x1302, "ExposureWarning", &faOnOffInterpreter},
{0, 1, 0, 0, 0x1400, "DynamicRange", &faDynamicRangeInterpreter},
{0, 1, 0, 0, 0x1401, "FilmMode", &faFilmModeInterpreter},
{0, 1, 0, 0, 0x1402, "DynamicRangeSetting", &faDRSettingInterpreter},
{0, 1, 0, 0, 0x1403, "DevelopmentDynamicRange", &stdInterpreter},
{0, 1, 0, 0, 0x1404, "MinFocalLength", &stdInterpreter},
{0, 1, 0, 0, 0x1405, "MaxFocalLength", &stdInterpreter},
{0, 1, 0, 0, 0x1406, "MaxApertureAtMinFocal", &stdInterpreter},
{0, 1, 0, 0, 0x1407, "MaxApertureAtMaxFocal", &stdInterpreter},
{0, 1, 0, 0, 0x8000, "FileSource", &stdInterpreter},
{0, 1, 0, 0, 0x8002, "OrderNumber", &stdInterpreter},
{0, 1, 0, 0, 0x8003, "FrameNumber", &stdInterpreter},
{-1, 0, 0, 0, 0, "", NULL}};
};
#endif

3
rtexif/nikonattribs.cc
View File

@@ -158,9 +158,10 @@ class NAAFInfoInterpreter : public Interpreter {
else if (aff&512)
if (af.str()=="") af << "Far Left";
else af << ", Far Left";
else if (aff&1024)
else if (aff&1024) {
if (af.str()=="") af << "Far Right";
else af << ", Far Right";
}
str << "AFPointsInFocus = " << af.str();
return str.str();

2
rtexif/pentaxattribs.cc
View File

@@ -946,7 +946,7 @@ public:
case 2: str << "AF-C";break;
case 3: str << "AF-A";break;
}
if( c & 0xF0 == 0) str << ", Point Selection Auto";
if( (c & 0xF0) == 0) str << ", Point Selection Auto";
else if( c & 0x20 ) str << ", Fixed Center Point Selected";
else if( c & 0x10 ) str << ", Point Selected";
return str.str();