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

Batch of correction to lower the number of GCC warnings

Browse Source
This commit is contained in:
Hombre
2010-08-29 02:25:59 +02:00
parent 6da0cf6792
commit 02dac0425d
40 changed files with 936 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
rtexif/nikonattribs.cc
View File

@@ -629,89 +629,89 @@ class NALensDataInterpreter : public Interpreter {
NALensDataInterpreter naLensDataInterpreter;
const TagAttrib nikon2Attribs[] = {
0, 1, 0, 0, 0x0002, "Unknown", &stdInterpreter,
0, 1, 0, 0, 0x0003, "Quality", &stdInterpreter,
0, 1, 0, 0, 0x0004, "ColorMode", &stdInterpreter,
0, 1, 0, 0, 0x0005, "ImageAdjustment", &stdInterpreter,
0, 1, 0, 0, 0x0006, "ISOSpeed", &naISOInterpreter,
0, 1, 0, 0, 0x0007, "WhiteBalance", &stdInterpreter,
0, 1, 0, 0, 0x0008, "Focus", &stdInterpreter,
0, 1, 0, 0, 0x0009, "Unknown", &stdInterpreter,
0, 1, 0, 0, 0x000a, "DigitalZoom", &stdInterpreter,
0, 1, 0, 0, 0x000b, "AuxiliaryLens", &stdInterpreter,
0, 1, 0, 0, 0x0f00, "Unknown", &stdInterpreter,
-1, 0, 0, 0, 0, "", NULL};
{0, 1, 0, 0, 0x0002, "Unknown", &stdInterpreter},
{0, 1, 0, 0, 0x0003, "Quality", &stdInterpreter},
{0, 1, 0, 0, 0x0004, "ColorMode", &stdInterpreter},
{0, 1, 0, 0, 0x0005, "ImageAdjustment", &stdInterpreter},
{0, 1, 0, 0, 0x0006, "ISOSpeed", &naISOInterpreter},
{0, 1, 0, 0, 0x0007, "WhiteBalance", &stdInterpreter},
{0, 1, 0, 0, 0x0008, "Focus", &stdInterpreter},
{0, 1, 0, 0, 0x0009, "Unknown", &stdInterpreter},
{0, 1, 0, 0, 0x000a, "DigitalZoom", &stdInterpreter},
{0, 1, 0, 0, 0x000b, "AuxiliaryLens", &stdInterpreter},
{0, 1, 0, 0, 0x0f00, "Unknown", &stdInterpreter},
{-1, 0, 0, 0, 0, "", NULL}};
const TagAttrib nikon3Attribs[] = {
0, 1, 0, 0, 0x0001, "MakerNoteVersion", &stdInterpreter,
0, 1, 0, 0, 0x0002, "ISOSpeed", &naISOInterpreter,
0, 1, 0, 0, 0x0003, "ColorMode", &stdInterpreter,
0, 1, 0, 0, 0x0004, "Quality", &stdInterpreter,
0, 1, 0, 0, 0x0005, "WhiteBalance", &stdInterpreter,
0, 1, 0, 0, 0x0006, "Sharpness", &stdInterpreter,
0, 1, 0, 0, 0x0007, "FocusMode", &stdInterpreter,
0, 1, 0, 0, 0x0008, "FlashSetting", &stdInterpreter,
0, 1, 0, 0, 0x0009, "FlashType", &stdInterpreter,
0, 1, 0, 0, 0x000b, "WhiteBalanceFineTune", &stdInterpreter,
0, 3, 0, 0, 0x000c, "ColorBalance1", &stdInterpreter,
0, 1, 0, 0, 0x000d, "ProgramShift", &stdInterpreter,
0, 1, 0, 0, 0x000e, "ExposureDifference", &stdInterpreter,
0, 1, 0, 0, 0x000f, "ISOSelection", &naISOInterpreter,
0, 1, 0, 0, 0x0010, "DataDump", &stdInterpreter,
1, 1, 0, 0, 0x0011, "NikonPreview", &stdInterpreter,
0, 1, 0, 0, 0x0012, "FlashExposureComp", &stdInterpreter,
0, 1, 0, 0, 0x0013, "ISOSetting", &stdInterpreter,
0, 1, 0, 0, 0x0016, "ImageBoundary", &stdInterpreter,
0, 1, 0, 0, 0x0018, "FlashExposureBracketValue", &stdInterpreter,
0, 1, 0, 0, 0x0019, "ExposureBracketValue", &stdInterpreter,
0, 1, 0, 0, 0x001a, "ImageProcessing", &stdInterpreter,
0, 1, 0, 0, 0x001b, "CropHiSpeed", &stdInterpreter,
0, 1, 0, 0, 0x001d, "SerialNumber", &stdInterpreter,
0, 1, 0, 0, 0x001e, "ColorSpace", &stdInterpreter,
0, 1, 0, 0, 0x0020, "ImageAuthentication", &stdInterpreter,
0, 1, 0, 0, 0x0080, "ImageAdjustment", &stdInterpreter,
0, 1, 0, 0, 0x0081, "ToneComp", &stdInterpreter,
0, 1, 0, 0, 0x0082, "AuxiliaryLens", &stdInterpreter,
0, 1, 0, 0, 0x0083, "LensType", &naLensTypeInterpreter,
0, 1, 0, 0, 0x0084, "Lens", &stdInterpreter,
0, 1, 0, 0, 0x0085, "ManualFocusDistance", &stdInterpreter,
0, 1, 0, 0, 0x0086, "DigitalZoom", &stdInterpreter,
0, 1, 0, 0, 0x0087, "FlashMode", &naFlashModeInterpreter,
0, 1, 0, 0, 0x0088, "AFInfo", &naAFInfoInterpreter,
0, 1, 0, 0, 0x0089, "ShootingMode", &naShootingModeInterpreter,
0, 1, 0, 0, 0x008a, "AutoBracketRelease", &stdInterpreter,
0, 1, 0, 0, 0x008b, "LensFStops", &stdInterpreter,
0, 1, 0, 0, 0x008c, "NEFCurve1", &stdInterpreter,
0, 1, 0, 0, 0x008d, "ColorHue", &stdInterpreter,
0, 1, 0, 0, 0x008f, "SceneMode", &stdInterpreter,
0, 1, 0, 0, 0x0090, "LightSource", &stdInterpreter,
0, 1, 0, 0, 0x0091, "ShotInfo", &stdInterpreter,
0, 1, 0, 0, 0x0092, "HueAdjustment", &stdInterpreter,
0, 1, 0, 0, 0x0094, "Saturation", &stdInterpreter,
0, 1, 0, 0, 0x0095, "NoiseReduction", &stdInterpreter,
0, 1, 0, 0, 0x0096, "NEFCurve2", &stdInterpreter,
0, 3, 0, 0, 0x0097, "ColorBalance", &stdInterpreter,
0, 1, 0, 0, 0x0098, "LensData", &naLensDataInterpreter,
0, 1, 0, 0, 0x0099, "RawImageCenter", &stdInterpreter,
0, 1, 0, 0, 0x009a, "SensorPixelSize", &stdInterpreter,
0, 1, 0, 0, 0x00a0, "SerialNumber", &stdInterpreter,
0, 1, 0, 0, 0x00a2, "ImageDataSize", &stdInterpreter,
0, 1, 0, 0, 0x00a5, "ImageCount", &stdInterpreter,
0, 1, 0, 0, 0x00a6, "DeletedImageCount", &stdInterpreter,
0, 1, 0, 0, 0x00a7, "ShutterCount", &stdInterpreter,
0, 1, 0, 0, 0x00a9, "ImageOptimization", &stdInterpreter,
0, 1, 0, 0, 0x00aa, "Saturation", &stdInterpreter,
0, 1, 0, 0, 0x00ab, "VariProgram", &stdInterpreter,
0, 1, 0, 0, 0x00ac, "ImageStabilization", &stdInterpreter,
0, 1, 0, 0, 0x00ad, "AFResponse", &stdInterpreter,
0, 1, 0, 0, 0x00b0, "MultiExposure", &stdInterpreter,
0, 1, 0, 0, 0x00b1, "HighISONoiseReduction", &naHiISONRInterpreter,
0, 1, 0, 0, 0x0e00, "PrintIM", &stdInterpreter,
0, 0, 0, 0, 0x0e01, "NikonCaptureData", &stdInterpreter,
0, 0, 0, 0, 0x0e09, "NikonCaptureVersion", &stdInterpreter,
0, 0, 0, 0, 0x0e0e, "NikonCaptureOffsets", &stdInterpreter,
0, 0, 0, 0, 0x0e10, "NikonScanIFD", &stdInterpreter,
-1, 0, 0, 0, 0, "", NULL};
{0, 1, 0, 0, 0x0001, "MakerNoteVersion", &stdInterpreter},
{0, 1, 0, 0, 0x0002, "ISOSpeed", &naISOInterpreter},
{0, 1, 0, 0, 0x0003, "ColorMode", &stdInterpreter},
{0, 1, 0, 0, 0x0004, "Quality", &stdInterpreter},
{0, 1, 0, 0, 0x0005, "WhiteBalance", &stdInterpreter},
{0, 1, 0, 0, 0x0006, "Sharpness", &stdInterpreter},
{0, 1, 0, 0, 0x0007, "FocusMode", &stdInterpreter},
{0, 1, 0, 0, 0x0008, "FlashSetting", &stdInterpreter},
{0, 1, 0, 0, 0x0009, "FlashType", &stdInterpreter},
{0, 1, 0, 0, 0x000b, "WhiteBalanceFineTune", &stdInterpreter},
{0, 3, 0, 0, 0x000c, "ColorBalance1", &stdInterpreter},
{0, 1, 0, 0, 0x000d, "ProgramShift", &stdInterpreter},
{0, 1, 0, 0, 0x000e, "ExposureDifference", &stdInterpreter},
{0, 1, 0, 0, 0x000f, "ISOSelection", &naISOInterpreter},
{0, 1, 0, 0, 0x0010, "DataDump", &stdInterpreter},
{1, 1, 0, 0, 0x0011, "NikonPreview", &stdInterpreter},
{0, 1, 0, 0, 0x0012, "FlashExposureComp", &stdInterpreter},
{0, 1, 0, 0, 0x0013, "ISOSetting", &stdInterpreter},
{0, 1, 0, 0, 0x0016, "ImageBoundary", &stdInterpreter},
{0, 1, 0, 0, 0x0018, "FlashExposureBracketValue", &stdInterpreter},
{0, 1, 0, 0, 0x0019, "ExposureBracketValue", &stdInterpreter},
{0, 1, 0, 0, 0x001a, "ImageProcessing", &stdInterpreter},
{0, 1, 0, 0, 0x001b, "CropHiSpeed", &stdInterpreter},
{0, 1, 0, 0, 0x001d, "SerialNumber", &stdInterpreter},
{0, 1, 0, 0, 0x001e, "ColorSpace", &stdInterpreter},
{0, 1, 0, 0, 0x0020, "ImageAuthentication", &stdInterpreter},
{0, 1, 0, 0, 0x0080, "ImageAdjustment", &stdInterpreter},
{0, 1, 0, 0, 0x0081, "ToneComp", &stdInterpreter},
{0, 1, 0, 0, 0x0082, "AuxiliaryLens", &stdInterpreter},
{0, 1, 0, 0, 0x0083, "LensType", &naLensTypeInterpreter},
{0, 1, 0, 0, 0x0084, "Lens", &stdInterpreter},
{0, 1, 0, 0, 0x0085, "ManualFocusDistance", &stdInterpreter},
{0, 1, 0, 0, 0x0086, "DigitalZoom", &stdInterpreter},
{0, 1, 0, 0, 0x0087, "FlashMode", &naFlashModeInterpreter},
{0, 1, 0, 0, 0x0088, "AFInfo", &naAFInfoInterpreter},
{0, 1, 0, 0, 0x0089, "ShootingMode", &naShootingModeInterpreter},
{0, 1, 0, 0, 0x008a, "AutoBracketRelease", &stdInterpreter},
{0, 1, 0, 0, 0x008b, "LensFStops", &stdInterpreter},
{0, 1, 0, 0, 0x008c, "NEFCurve1", &stdInterpreter},
{0, 1, 0, 0, 0x008d, "ColorHue", &stdInterpreter},
{0, 1, 0, 0, 0x008f, "SceneMode", &stdInterpreter},
{0, 1, 0, 0, 0x0090, "LightSource", &stdInterpreter},
{0, 1, 0, 0, 0x0091, "ShotInfo", &stdInterpreter},
{0, 1, 0, 0, 0x0092, "HueAdjustment", &stdInterpreter},
{0, 1, 0, 0, 0x0094, "Saturation", &stdInterpreter},
{0, 1, 0, 0, 0x0095, "NoiseReduction", &stdInterpreter},
{0, 1, 0, 0, 0x0096, "NEFCurve2", &stdInterpreter},
{0, 3, 0, 0, 0x0097, "ColorBalance", &stdInterpreter},
{0, 1, 0, 0, 0x0098, "LensData", &naLensDataInterpreter},
{0, 1, 0, 0, 0x0099, "RawImageCenter", &stdInterpreter},
{0, 1, 0, 0, 0x009a, "SensorPixelSize", &stdInterpreter},
{0, 1, 0, 0, 0x00a0, "SerialNumber", &stdInterpreter},
{0, 1, 0, 0, 0x00a2, "ImageDataSize", &stdInterpreter},
{0, 1, 0, 0, 0x00a5, "ImageCount", &stdInterpreter},
{0, 1, 0, 0, 0x00a6, "DeletedImageCount", &stdInterpreter},
{0, 1, 0, 0, 0x00a7, "ShutterCount", &stdInterpreter},
{0, 1, 0, 0, 0x00a9, "ImageOptimization", &stdInterpreter},
{0, 1, 0, 0, 0x00aa, "Saturation", &stdInterpreter},
{0, 1, 0, 0, 0x00ab, "VariProgram", &stdInterpreter},
{0, 1, 0, 0, 0x00ac, "ImageStabilization", &stdInterpreter},
{0, 1, 0, 0, 0x00ad, "AFResponse", &stdInterpreter},
{0, 1, 0, 0, 0x00b0, "MultiExposure", &stdInterpreter},
{0, 1, 0, 0, 0x00b1, "HighISONoiseReduction", &naHiISONRInterpreter},
{0, 1, 0, 0, 0x0e00, "PrintIM", &stdInterpreter},
{0, 0, 0, 0, 0x0e01, "NikonCaptureData", &stdInterpreter},
{0, 0, 0, 0, 0x0e09, "NikonCaptureVersion", &stdInterpreter},
{0, 0, 0, 0, 0x0e0e, "NikonCaptureOffsets", &stdInterpreter},
{0, 0, 0, 0, 0x0e10, "NikonScanIFD", &stdInterpreter},
{-1, 0, 0, 0, 0, "", NULL}};
}
#endif