Apply modernize-use-nullptr
Setup:
- `mkdir tidy; cd tidy`
- `cmake .. -DCMAKE_BUILD_TYPE=debug -DPROC_TARGET_NUMBER=1 -DCACHE_NAME_SUFFIX=4 -DBINDIR=. -DDATADIR=. -DBUILD_BUNDLE=ON -DWITH_LTO=OFF -DOPTION_OMP=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON`
- `cd ..`
- `find -name '*.cc' -exec clang-tidy-3.8 -header-filter=.* -p=tidy -fix-errors -checks=modernize-use-nullptr {} \;`
This commit is contained in:
@@ -1780,205 +1780,205 @@ public:
|
||||
CAAspectRatioInterpreter caAspectRatioInterpreter;
|
||||
|
||||
const TagAttrib canonCameraSettingsAttribs[] = {
|
||||
{0, AC_WRITE, 0, 0, 1, AUTO, "MacroMode", &caMacroModeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 2, AUTO, "SelfTimer", &caSelfTimerInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 3, AUTO, "Quality", &caQualityInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 4, AUTO, "CanonFlashMode", &caFlashModeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 5, AUTO, "ContinuousDrive", &caContinuousDriveInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 7, AUTO, "FocusMode", &caFocusModeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 9, AUTO, "RecordMode", &caRecordModeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 10, AUTO, "CanonImageSize", &caImageSizeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 11, AUTO, "EasyMode", &caEasyModeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 12, AUTO, "DigitalZoom", &caDigitalZoomInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 13, AUTO, "Contrast", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 14, AUTO, "Saturation", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 15, AUTO, "Sharpness", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 16, AUTO, "CameraISO", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 17, AUTO, "MeteringMode", &caMeteringModeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 18, AUTO, "FocusRange", &caFocusRangeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 19, AUTO, "AFPoint", &caAFPointInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 20, AUTO, "CanonExposureMode", &caExposureModeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 22, AUTO, "LensID", &caLensInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 23, AUTO, "LongFocal", &caFocalInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 24, AUTO, "ShortFocal", &caFocalInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 25, AUTO, "FocalUnits", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 26, AUTO, "MaxAperture", &caApertureInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 27, AUTO, "MinAperture", &caApertureInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 28, AUTO, "FlashActivity", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 29, AUTO, "FlashBits", &caFlashBitsInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 32, AUTO, "FocusContinuous", &caFocusContinuousInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 33, AUTO, "AESetting", &caAESettingsInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 34, AUTO, "ImageStabilization", &caStabilizationInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 35, AUTO, "DisplayAperture", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 36, AUTO, "ZoomSourceWidth", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 37, AUTO, "ZoomTargetWidth", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 39, AUTO, "SpotMeteringMode", &caSpotMeteringInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 40, AUTO, "PhotoEffect", &caPhotoEffectInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 41, AUTO, "ManualFlashOutput", &caManualFlashInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 42, AUTO, "ColorTone", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 46, AUTO, "SRAWQuality", &caRAWQualityInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, 0, 0, AUTO, "", NULL}
|
||||
{0, AC_WRITE, 0, nullptr, 1, AUTO, "MacroMode", &caMacroModeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 2, AUTO, "SelfTimer", &caSelfTimerInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 3, AUTO, "Quality", &caQualityInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 4, AUTO, "CanonFlashMode", &caFlashModeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 5, AUTO, "ContinuousDrive", &caContinuousDriveInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 7, AUTO, "FocusMode", &caFocusModeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 9, AUTO, "RecordMode", &caRecordModeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 10, AUTO, "CanonImageSize", &caImageSizeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 11, AUTO, "EasyMode", &caEasyModeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 12, AUTO, "DigitalZoom", &caDigitalZoomInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 13, AUTO, "Contrast", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 14, AUTO, "Saturation", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 15, AUTO, "Sharpness", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 16, AUTO, "CameraISO", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 17, AUTO, "MeteringMode", &caMeteringModeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 18, AUTO, "FocusRange", &caFocusRangeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 19, AUTO, "AFPoint", &caAFPointInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 20, AUTO, "CanonExposureMode", &caExposureModeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 22, AUTO, "LensID", &caLensInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 23, AUTO, "LongFocal", &caFocalInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 24, AUTO, "ShortFocal", &caFocalInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 25, AUTO, "FocalUnits", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 26, AUTO, "MaxAperture", &caApertureInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 27, AUTO, "MinAperture", &caApertureInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 28, AUTO, "FlashActivity", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 29, AUTO, "FlashBits", &caFlashBitsInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 32, AUTO, "FocusContinuous", &caFocusContinuousInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 33, AUTO, "AESetting", &caAESettingsInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 34, AUTO, "ImageStabilization", &caStabilizationInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 35, AUTO, "DisplayAperture", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 36, AUTO, "ZoomSourceWidth", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 37, AUTO, "ZoomTargetWidth", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 39, AUTO, "SpotMeteringMode", &caSpotMeteringInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 40, AUTO, "PhotoEffect", &caPhotoEffectInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 41, AUTO, "ManualFlashOutput", &caManualFlashInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 42, AUTO, "ColorTone", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 46, AUTO, "SRAWQuality", &caRAWQualityInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, nullptr, 0, AUTO, "", nullptr}
|
||||
};
|
||||
|
||||
const TagAttrib canonFocalLengthAttribs[] = {
|
||||
{0, AC_WRITE, 0, 0, 0, AUTO, "FocalType", &caFocalTypeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 1, AUTO, "FocalLength", &caFocalInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 2, AUTO, "FocalPlaneXSize", &caFocalPlaneInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 3, AUTO, "FocalPlaneYSize", &caFocalPlaneInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, 0, 0, AUTO, "", NULL}
|
||||
{0, AC_WRITE, 0, nullptr, 0, AUTO, "FocalType", &caFocalTypeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 1, AUTO, "FocalLength", &caFocalInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 2, AUTO, "FocalPlaneXSize", &caFocalPlaneInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 3, AUTO, "FocalPlaneYSize", &caFocalPlaneInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, nullptr, 0, AUTO, "", nullptr}
|
||||
};
|
||||
|
||||
const TagAttrib canonShotInfoAttribs[] = {
|
||||
{0, AC_WRITE, 0, 0, 1, AUTO, "AutoISO", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 2, AUTO, "BaseISO" , &caBaseISOInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 3, AUTO, "MeasuredEV", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 4, AUTO, "TargetAperture", &caApertureInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 5, AUTO, "TargetExposureTime", &caExposureTimeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 6, AUTO, "ExposureCompensation", &caEVInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 7, AUTO, "WhiteBalance", &caWhiteBalanceInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 8, AUTO, "SlowShutter", &caSlowShutterInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 9, AUTO, "SequenceNumber", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 10, AUTO, "OpticalZoomCode", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 13, AUTO, "FlashGuideNumber" , &caFlashGuideNumberInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 14, AUTO, "AFPointsInFocus", &caAFPointsInFocusInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 15, AUTO, "FlashExposureComp", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 16, AUTO, "AutoExposureBracketing", &caAutoExposureBracketingInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 17, AUTO, "AEBBracketValue", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 18, AUTO, "ControlMode", &caControModeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 21, AUTO, "FNumber" , &caApertureInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 22, AUTO, "ExposureTime", &caExposureTimeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 23, AUTO, "MeasuredEV2", &caMeasuredEVInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 24, AUTO, "BulbDuration", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 26, AUTO, "CameraType", &caCameraTypeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 27, AUTO, "AutoRotate", &caAutoRotateInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 28, AUTO, "NDFilter", &caOnOffInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 29, AUTO, "Self-timer2", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 33, AUTO, "FlashOutput", &stdInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, 0, 0, AUTO, "", NULL},
|
||||
{0, AC_WRITE, 0, nullptr, 1, AUTO, "AutoISO", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 2, AUTO, "BaseISO" , &caBaseISOInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 3, AUTO, "MeasuredEV", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 4, AUTO, "TargetAperture", &caApertureInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 5, AUTO, "TargetExposureTime", &caExposureTimeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 6, AUTO, "ExposureCompensation", &caEVInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 7, AUTO, "WhiteBalance", &caWhiteBalanceInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 8, AUTO, "SlowShutter", &caSlowShutterInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 9, AUTO, "SequenceNumber", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 10, AUTO, "OpticalZoomCode", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 13, AUTO, "FlashGuideNumber" , &caFlashGuideNumberInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 14, AUTO, "AFPointsInFocus", &caAFPointsInFocusInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 15, AUTO, "FlashExposureComp", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 16, AUTO, "AutoExposureBracketing", &caAutoExposureBracketingInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 17, AUTO, "AEBBracketValue", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 18, AUTO, "ControlMode", &caControModeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 21, AUTO, "FNumber" , &caApertureInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 22, AUTO, "ExposureTime", &caExposureTimeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 23, AUTO, "MeasuredEV2", &caMeasuredEVInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 24, AUTO, "BulbDuration", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 26, AUTO, "CameraType", &caCameraTypeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 27, AUTO, "AutoRotate", &caAutoRotateInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 28, AUTO, "NDFilter", &caOnOffInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 29, AUTO, "Self-timer2", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 33, AUTO, "FlashOutput", &stdInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, nullptr, 0, AUTO, "", nullptr},
|
||||
};
|
||||
|
||||
const TagAttrib canonFileInfoAttribs[] = {
|
||||
{0, AC_WRITE, 0, 0, 1, AUTO, "FileNumber", &caFileNumberInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 3, AUTO, "BracketMode", &caBracketModeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 4, AUTO, "BracketValue", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 5, AUTO, "BracketShotNumber", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 6, AUTO, "RawJpgQuality", &caRAWJpegQualityInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 7, AUTO, "RawJpgSize", &caJpegSizeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 8, AUTO, "NoiseReduction", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 9, AUTO, "WBBracketMode" , &caWBBracketModeInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 12, AUTO, "WBBracketValueAB", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 13, AUTO, "WBBracketValueGM", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 14, AUTO, "FilterEffect" , &caFilterEffectInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 15, AUTO, "ToningEffect" , &caToningEffectInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 19, AUTO, "LiveViewShooting" , &caOnOffInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 20, AUTO, "FocusDistanceUpper", &caFocusDistanceInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 21, AUTO, "FocusDistanceLower", &caFocusDistanceInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 25, AUTO, "FlashExposureLock" , &caOnOffInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, 0, 0, AUTO, "", NULL},
|
||||
{0, AC_WRITE, 0, nullptr, 1, AUTO, "FileNumber", &caFileNumberInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 3, AUTO, "BracketMode", &caBracketModeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 4, AUTO, "BracketValue", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 5, AUTO, "BracketShotNumber", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 6, AUTO, "RawJpgQuality", &caRAWJpegQualityInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 7, AUTO, "RawJpgSize", &caJpegSizeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 8, AUTO, "NoiseReduction", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 9, AUTO, "WBBracketMode" , &caWBBracketModeInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 12, AUTO, "WBBracketValueAB", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 13, AUTO, "WBBracketValueGM", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 14, AUTO, "FilterEffect" , &caFilterEffectInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 15, AUTO, "ToningEffect" , &caToningEffectInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 19, AUTO, "LiveViewShooting" , &caOnOffInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 20, AUTO, "FocusDistanceUpper", &caFocusDistanceInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 21, AUTO, "FocusDistanceLower", &caFocusDistanceInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 25, AUTO, "FlashExposureLock" , &caOnOffInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, nullptr, 0, AUTO, "", nullptr},
|
||||
};
|
||||
|
||||
const TagAttrib canonProcessingInfoAttribs[] = {
|
||||
{0, AC_WRITE, 0, 0, 1, AUTO, "ToneCurve", &caToneCurveInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 2, AUTO, "Sharpness", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 3, AUTO, "SharpnessFrequency", &caSharpnessFrequencyInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 4, AUTO, "SensorRedLevel", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 5, AUTO, "SensorBlueLevel", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 6, AUTO, "WhiteBalanceRed", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 7, AUTO, "WhiteBalanceBlue", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 8, AUTO, "WhiteBalance", &caWhiteBalanceInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 9, AUTO, "ColorTemperature", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 10, AUTO, "PictureStyle", &caPictureStyleInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 11, AUTO, "DigitalGain", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 12, AUTO, "WBShiftAB", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 13, AUTO, "WBShiftGM", &stdInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, 0, 0, AUTO, "", NULL},
|
||||
{0, AC_WRITE, 0, nullptr, 1, AUTO, "ToneCurve", &caToneCurveInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 2, AUTO, "Sharpness", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 3, AUTO, "SharpnessFrequency", &caSharpnessFrequencyInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 4, AUTO, "SensorRedLevel", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 5, AUTO, "SensorBlueLevel", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 6, AUTO, "WhiteBalanceRed", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 7, AUTO, "WhiteBalanceBlue", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 8, AUTO, "WhiteBalance", &caWhiteBalanceInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 9, AUTO, "ColorTemperature", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 10, AUTO, "PictureStyle", &caPictureStyleInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 11, AUTO, "DigitalGain", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 12, AUTO, "WBShiftAB", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 13, AUTO, "WBShiftGM", &stdInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, nullptr, 0, AUTO, "", nullptr},
|
||||
};
|
||||
|
||||
const TagAttrib canonPanoramaInfoAttribs[] = {
|
||||
{0, AC_WRITE, 0, 0, 2, AUTO, "PanoramaFrameNumber", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 5, AUTO, "PanoramaDirection", &caPanoramaDirectionInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, 0, 0, AUTO, "", NULL},
|
||||
{0, AC_WRITE, 0, nullptr, 2, AUTO, "PanoramaFrameNumber", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 5, AUTO, "PanoramaDirection", &caPanoramaDirectionInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, nullptr, 0, AUTO, "", nullptr},
|
||||
};
|
||||
|
||||
const TagAttrib canonCropInfoAttribs[] = {
|
||||
{0, AC_WRITE, 0, 0, 0, AUTO, "CropLeftMargin", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 1, AUTO, "CropRightMargin", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 2, AUTO, "CropTopMargin", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 3, AUTO, "CropBottomMargin", &stdInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, 0, 0, AUTO, "", NULL},
|
||||
{0, AC_WRITE, 0, nullptr, 0, AUTO, "CropLeftMargin", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 1, AUTO, "CropRightMargin", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 2, AUTO, "CropTopMargin", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 3, AUTO, "CropBottomMargin", &stdInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, nullptr, 0, AUTO, "", nullptr},
|
||||
};
|
||||
|
||||
const TagAttrib canonAspectInfoAttribs[] = {
|
||||
{0, AC_WRITE, 0, 0, 0, AUTO, "AspectRatio", &caAspectRatioInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 1, AUTO, "CroppedImageWidth", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 2, AUTO, "CroppedImageHeight", &stdInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, 0, 0, AUTO, "", NULL},
|
||||
{0, AC_WRITE, 0, nullptr, 0, AUTO, "AspectRatio", &caAspectRatioInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 1, AUTO, "CroppedImageWidth", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 2, AUTO, "CroppedImageHeight", &stdInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, nullptr, 0, AUTO, "", nullptr},
|
||||
};
|
||||
|
||||
const TagAttrib canonMicroAdjustAttrib[] = {
|
||||
{0, AC_WRITE, 0, 0, 1, AUTO, "AFMicroAdjActive", &caOnOffInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, 0, 2, AUTO, "", NULL},
|
||||
{0, AC_WRITE, 0, nullptr, 1, AUTO, "AFMicroAdjActive", &caOnOffInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, nullptr, 2, AUTO, "", nullptr},
|
||||
};
|
||||
|
||||
const TagAttrib canonAttribs[] = {
|
||||
{0, AC_WRITE, 0, canonCameraSettingsAttribs, 0x0001, AUTO, "CanonCameraSettings", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, canonFocalLengthAttribs, 0x0002, AUTO, "CanonFocalLength", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0003, AUTO, "CanonFlashInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0003, AUTO, "CanonFlashInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, canonShotInfoAttribs, 0x0004, AUTO, "CanonShotInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, canonPanoramaInfoAttribs, 0x0005, AUTO, "CanonPanorama", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0006, AUTO, "CanonImageType", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0007, AUTO, "CanonFirmwareVersion", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0008, AUTO, "FileNumber", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0009, AUTO, "OwnerName", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x000a, AUTO, "ColorInfoD30", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x000c, AUTO, "SerialNumber", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x000d, AUTO, "CanonCameraInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x000e, AUTO, "CanonFileLength", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x000f, AUTO, "CustomFunctions", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0010, AUTO, "CanonModelID", &caModelIDInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0012, AUTO, "CanonAFInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0015, AUTO, "SerialNumberFormat", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x001c, AUTO, "DateStampMode", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x001d, AUTO, "MyColors", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x001e, AUTO, "FirmwareRevision", &stdInterpreter},
|
||||
{0, AC_NEW, 0, 0, 0x0024, AUTO, "FaceDetect1", &stdInterpreter},
|
||||
{0, AC_NEW, 0, 0, 0x0025, AUTO, "FaceDetect2", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0026, AUTO, "CanonAFInfo2", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0083, AUTO, "OriginalDecisionData", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0090, AUTO, "CustomFunctions1D", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0091, AUTO, "PersonalFunctions", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0092, AUTO, "PersonalFunctionValues", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0006, AUTO, "CanonImageType", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0007, AUTO, "CanonFirmwareVersion", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0008, AUTO, "FileNumber", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0009, AUTO, "OwnerName", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x000a, AUTO, "ColorInfoD30", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x000c, AUTO, "SerialNumber", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x000d, AUTO, "CanonCameraInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x000e, AUTO, "CanonFileLength", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x000f, AUTO, "CustomFunctions", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0010, AUTO, "CanonModelID", &caModelIDInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0012, AUTO, "CanonAFInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0015, AUTO, "SerialNumberFormat", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x001c, AUTO, "DateStampMode", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x001d, AUTO, "MyColors", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x001e, AUTO, "FirmwareRevision", &stdInterpreter},
|
||||
{0, AC_NEW, 0, nullptr, 0x0024, AUTO, "FaceDetect1", &stdInterpreter},
|
||||
{0, AC_NEW, 0, nullptr, 0x0025, AUTO, "FaceDetect2", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0026, AUTO, "CanonAFInfo2", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0083, AUTO, "OriginalDecisionData", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0090, AUTO, "CustomFunctions1D", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0091, AUTO, "PersonalFunctions", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0092, AUTO, "PersonalFunctionValues", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, canonFileInfoAttribs, 0x0093, AUTO, "CanonFileInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0094, AUTO, "AFPointsInFocus1D", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0095, AUTO, "LensType", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0096, AUTO, "InternalSerialNumber", &caIntSerNumInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0097, AUTO, "DustRemovalData", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0094, AUTO, "AFPointsInFocus1D", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0095, AUTO, "LensType", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0096, AUTO, "InternalSerialNumber", &caIntSerNumInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0097, AUTO, "DustRemovalData", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, canonCropInfoAttribs, 0x0098, AUTO, "CropInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x0099, AUTO, "CustomFunctions2", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x0099, AUTO, "CustomFunctions2", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, canonAspectInfoAttribs, 0x009a, AUTO, "AspectInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, canonProcessingInfoAttribs, 0x00a0, AUTO, "ProcessingInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00a1, AUTO, "ToneCurveTable", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00a2, AUTO, "SharpnessTable", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00a3, AUTO, "SharpnessFreqTable", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00a4, AUTO, "WhiteBalanceTable", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00a9, AUTO, "ColorBalance", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00aa, AUTO, "MeasuredColor", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00ae, AUTO, "ColorTemperature", &stdInterpreter},
|
||||
{0, AC_NEW , 0, 0, 0x00b0, AUTO, "CanonFlags", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00b1, AUTO, "ModifiedInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00b2, AUTO, "ToneCurveMatching", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00b3, AUTO, "WhiteBalanceMatching", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00b4, AUTO, "ColorSpace", &stdInterpreter},
|
||||
{1, AC_WRITE, 0, 0, 0x00b6, AUTO, "PreviewImageInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00d0, AUTO, "VRDOffset", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x00e0, AUTO, "SensorInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x4001, AUTO, "ColorBalance", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x4002, AUTO, "UnknownBlock1", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, 0, 0x4003, AUTO, "ColorInfo", &stdInterpreter},
|
||||
{1, AC_WRITE, 0, 0, 0x4005, AUTO, "UnknownBlock2", &stdInterpreter},
|
||||
{1, AC_WRITE, 0, 0, 0x4008, AUTO, "BlackLevel", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00a1, AUTO, "ToneCurveTable", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00a2, AUTO, "SharpnessTable", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00a3, AUTO, "SharpnessFreqTable", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00a4, AUTO, "WhiteBalanceTable", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00a9, AUTO, "ColorBalance", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00aa, AUTO, "MeasuredColor", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00ae, AUTO, "ColorTemperature", &stdInterpreter},
|
||||
{0, AC_NEW , 0, nullptr, 0x00b0, AUTO, "CanonFlags", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00b1, AUTO, "ModifiedInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00b2, AUTO, "ToneCurveMatching", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00b3, AUTO, "WhiteBalanceMatching", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00b4, AUTO, "ColorSpace", &stdInterpreter},
|
||||
{1, AC_WRITE, 0, nullptr, 0x00b6, AUTO, "PreviewImageInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00d0, AUTO, "VRDOffset", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x00e0, AUTO, "SensorInfo", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x4001, AUTO, "ColorBalance", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x4002, AUTO, "UnknownBlock1", &stdInterpreter},
|
||||
{0, AC_WRITE, 0, nullptr, 0x4003, AUTO, "ColorInfo", &stdInterpreter},
|
||||
{1, AC_WRITE, 0, nullptr, 0x4005, AUTO, "UnknownBlock2", &stdInterpreter},
|
||||
{1, AC_WRITE, 0, nullptr, 0x4008, AUTO, "BlackLevel", &stdInterpreter},
|
||||
{1, AC_WRITE, 0, canonMicroAdjustAttrib, 0x4013, AUTO, "AFMicroAdj", &stdInterpreter},
|
||||
{ -1, AC_DONTWRITE, 0, 0, 0, AUTO, "", NULL}
|
||||
{ -1, AC_DONTWRITE, 0, nullptr, 0, AUTO, "", nullptr}
|
||||
};
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user