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

Fix most Clang 7 warnings (fixes #4972)

Browse Source
This commit is contained in:
Flössie
2019-02-17 12:07:48 +01:00
parent e491c42b5e
commit c85dc2811b
14 changed files with 237 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/ipretinex.cc
View File

@@ -393,7 +393,7 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e
pond /= log(elogt); pond /= log(elogt);
} }
auto shmap = ((mapmet == 2 || mapmet == 3 || mapmet == 4) && it == 1) ? new SHMap (W_L, H_L, true) : nullptr; auto shmap = ((mapmet == 2 || mapmet == 3 || mapmet == 4) && it == 1) ? new SHMap (W_L, H_L) : nullptr;
float *buffer = new float[W_L * H_L];; float *buffer = new float[W_L * H_L];;

2
rtengine/shmap.cc
View File

@@ -30,7 +30,7 @@ namespace rtengine
extern const Settings* settings; extern const Settings* settings;
SHMap::SHMap (int w, int h, bool multiThread) : max_f(0.f), min_f(0.f), avg(0.f), W(w), H(h), multiThread(multiThread) SHMap::SHMap (int w, int h) : max_f(0.f), min_f(0.f), avg(0.f), W(w), H(h)
{ {
map = new float*[H]; map = new float*[H];

3
rtengine/shmap.h
View File

@@ -34,7 +34,7 @@ public:
float** map; float** map;
float max_f, min_f, avg; float max_f, min_f, avg;
SHMap (int w, int h, bool multiThread); SHMap (int w, int h);
~SHMap (); ~SHMap ();
void update (Imagefloat* img, double radius, double lumi[3], bool hq, int skip); void update (Imagefloat* img, double radius, double lumi[3], bool hq, int skip);
@@ -43,7 +43,6 @@ public:
private: private:
int W, H; int W, H;
bool multiThread;
void fillLuminance( Imagefloat * img, float **luminance, double lumi[3] ); void fillLuminance( Imagefloat * img, float **luminance, double lumi[3] );
void fillLuminanceL( float ** L, float **luminance ); void fillLuminanceL( float ** L, float **luminance );

80
rtexif/canonattribs.cc
View File

@@ -78,7 +78,7 @@ public:
}; };
CAApertureInterpreter caApertureInterpreter; CAApertureInterpreter caApertureInterpreter;
class CAMacroModeInterpreter : public ChoiceInterpreter class CAMacroModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAMacroModeInterpreter() CAMacroModeInterpreter()
@@ -107,7 +107,7 @@ public:
}; };
CASelfTimerInterpreter caSelfTimerInterpreter; CASelfTimerInterpreter caSelfTimerInterpreter;
class CAQualityInterpreter : public ChoiceInterpreter class CAQualityInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAQualityInterpreter() CAQualityInterpreter()
@@ -121,7 +121,7 @@ public:
}; };
CAQualityInterpreter caQualityInterpreter; CAQualityInterpreter caQualityInterpreter;
class CAFlashModeInterpreter : public ChoiceInterpreter class CAFlashModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAFlashModeInterpreter() CAFlashModeInterpreter()
@@ -138,7 +138,7 @@ public:
}; };
CAFlashModeInterpreter caFlashModeInterpreter; CAFlashModeInterpreter caFlashModeInterpreter;
class CAContinuousDriveInterpreter : public ChoiceInterpreter class CAContinuousDriveInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAContinuousDriveInterpreter() CAContinuousDriveInterpreter()
@@ -156,7 +156,7 @@ public:
}; };
CAContinuousDriveInterpreter caContinuousDriveInterpreter; CAContinuousDriveInterpreter caContinuousDriveInterpreter;
class CAFocusModeInterpreter : public ChoiceInterpreter class CAFocusModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAFocusModeInterpreter() CAFocusModeInterpreter()
@@ -176,7 +176,7 @@ public:
}; };
CAFocusModeInterpreter caFocusModeInterpreter; CAFocusModeInterpreter caFocusModeInterpreter;
class CARecordModeInterpreter : public ChoiceInterpreter class CARecordModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CARecordModeInterpreter() CARecordModeInterpreter()
@@ -194,7 +194,7 @@ public:
}; };
CARecordModeInterpreter caRecordModeInterpreter; CARecordModeInterpreter caRecordModeInterpreter;
class CAImageSizeInterpreter : public ChoiceInterpreter class CAImageSizeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAImageSizeInterpreter () CAImageSizeInterpreter ()
@@ -220,7 +220,7 @@ public:
}; };
CAImageSizeInterpreter caImageSizeInterpreter; CAImageSizeInterpreter caImageSizeInterpreter;
class CAEasyModeInterpreter : public ChoiceInterpreter class CAEasyModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAEasyModeInterpreter () CAEasyModeInterpreter ()
@@ -300,7 +300,7 @@ public:
}; };
CAEasyModeInterpreter caEasyModeInterpreter; CAEasyModeInterpreter caEasyModeInterpreter;
class CADigitalZoomInterpreter : public ChoiceInterpreter class CADigitalZoomInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CADigitalZoomInterpreter() CADigitalZoomInterpreter()
@@ -313,7 +313,7 @@ public:
}; };
CADigitalZoomInterpreter caDigitalZoomInterpreter; CADigitalZoomInterpreter caDigitalZoomInterpreter;
class CAMeteringModeInterpreter : public ChoiceInterpreter class CAMeteringModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAMeteringModeInterpreter() CAMeteringModeInterpreter()
@@ -328,7 +328,7 @@ public:
}; };
CAMeteringModeInterpreter caMeteringModeInterpreter; CAMeteringModeInterpreter caMeteringModeInterpreter;
class CAFocusRangeInterpreter : public ChoiceInterpreter class CAFocusRangeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAFocusRangeInterpreter() CAFocusRangeInterpreter()
@@ -348,7 +348,7 @@ public:
}; };
CAFocusRangeInterpreter caFocusRangeInterpreter; CAFocusRangeInterpreter caFocusRangeInterpreter;
class CAAFPointInterpreter : public ChoiceInterpreter class CAAFPointInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAAFPointInterpreter() CAAFPointInterpreter()
@@ -365,7 +365,7 @@ public:
}; };
CAAFPointInterpreter caAFPointInterpreter; CAAFPointInterpreter caAFPointInterpreter;
class CAExposureModeInterpreter : public ChoiceInterpreter class CAExposureModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAExposureModeInterpreter() CAExposureModeInterpreter()
@@ -431,7 +431,7 @@ public:
}; };
CAFlashBitsInterpreter caFlashBitsInterpreter; CAFlashBitsInterpreter caFlashBitsInterpreter;
class CAFocusContinuousInterpreter : public ChoiceInterpreter class CAFocusContinuousInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAFocusContinuousInterpreter() CAFocusContinuousInterpreter()
@@ -443,7 +443,7 @@ public:
}; };
CAFocusContinuousInterpreter caFocusContinuousInterpreter; CAFocusContinuousInterpreter caFocusContinuousInterpreter;
class CAAESettingsInterpreter : public ChoiceInterpreter class CAAESettingsInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAAESettingsInterpreter() CAAESettingsInterpreter()
@@ -457,7 +457,7 @@ public:
}; };
CAAESettingsInterpreter caAESettingsInterpreter; CAAESettingsInterpreter caAESettingsInterpreter;
class CAStabilizationInterpreter : public ChoiceInterpreter class CAStabilizationInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAStabilizationInterpreter() CAStabilizationInterpreter()
@@ -476,7 +476,7 @@ public:
}; };
CAStabilizationInterpreter caStabilizationInterpreter; CAStabilizationInterpreter caStabilizationInterpreter;
class CASpotMeteringInterpreter : public ChoiceInterpreter class CASpotMeteringInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CASpotMeteringInterpreter() CASpotMeteringInterpreter()
@@ -487,7 +487,7 @@ public:
}; };
CASpotMeteringInterpreter caSpotMeteringInterpreter; CASpotMeteringInterpreter caSpotMeteringInterpreter;
class CAPhotoEffectInterpreter : public ChoiceInterpreter class CAPhotoEffectInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAPhotoEffectInterpreter() CAPhotoEffectInterpreter()
@@ -504,7 +504,7 @@ public:
}; };
CAPhotoEffectInterpreter caPhotoEffectInterpreter; CAPhotoEffectInterpreter caPhotoEffectInterpreter;
class CAManualFlashInterpreter : public ChoiceInterpreter class CAManualFlashInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAManualFlashInterpreter() CAManualFlashInterpreter()
@@ -518,7 +518,7 @@ public:
}; };
CAManualFlashInterpreter caManualFlashInterpreter; CAManualFlashInterpreter caManualFlashInterpreter;
class CARAWQualityInterpreter : public ChoiceInterpreter class CARAWQualityInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CARAWQualityInterpreter() CARAWQualityInterpreter()
@@ -1094,7 +1094,7 @@ public:
}; };
CALensInterpreter caLensInterpreter; CALensInterpreter caLensInterpreter;
class CAFocalTypeInterpreter : public ChoiceInterpreter class CAFocalTypeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAFocalTypeInterpreter() CAFocalTypeInterpreter()
@@ -1183,7 +1183,7 @@ public:
}; };
CABaseISOInterpreter caBaseISOInterpreter; CABaseISOInterpreter caBaseISOInterpreter;
class CAToneCurveInterpreter : public ChoiceInterpreter class CAToneCurveInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAToneCurveInterpreter() CAToneCurveInterpreter()
@@ -1195,7 +1195,7 @@ public:
}; };
CAToneCurveInterpreter caToneCurveInterpreter; CAToneCurveInterpreter caToneCurveInterpreter;
class CASharpnessFrequencyInterpreter : public ChoiceInterpreter class CASharpnessFrequencyInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CASharpnessFrequencyInterpreter() CASharpnessFrequencyInterpreter()
@@ -1210,7 +1210,7 @@ public:
}; };
CASharpnessFrequencyInterpreter caSharpnessFrequencyInterpreter; CASharpnessFrequencyInterpreter caSharpnessFrequencyInterpreter;
class CAWhiteBalanceInterpreter : public ChoiceInterpreter class CAWhiteBalanceInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAWhiteBalanceInterpreter() CAWhiteBalanceInterpreter()
@@ -1241,7 +1241,7 @@ public:
}; };
CAWhiteBalanceInterpreter caWhiteBalanceInterpreter; CAWhiteBalanceInterpreter caWhiteBalanceInterpreter;
class CAPictureStyleInterpreter : public ChoiceInterpreter class CAPictureStyleInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAPictureStyleInterpreter() CAPictureStyleInterpreter()
@@ -1272,7 +1272,7 @@ public:
}; };
CAPictureStyleInterpreter caPictureStyleInterpreter; CAPictureStyleInterpreter caPictureStyleInterpreter;
class CASlowShutterInterpreter : public ChoiceInterpreter class CASlowShutterInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CASlowShutterInterpreter() CASlowShutterInterpreter()
@@ -1303,7 +1303,7 @@ public:
}; };
CAFlashGuideNumberInterpreter caFlashGuideNumberInterpreter; CAFlashGuideNumberInterpreter caFlashGuideNumberInterpreter;
class CAAFPointsInFocusInterpreter : public ChoiceInterpreter class CAAFPointsInFocusInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAAFPointsInFocusInterpreter() CAAFPointsInFocusInterpreter()
@@ -1320,7 +1320,7 @@ public:
}; };
CAAFPointsInFocusInterpreter caAFPointsInFocusInterpreter; CAAFPointsInFocusInterpreter caAFPointsInFocusInterpreter;
class CAAutoExposureBracketingInterpreter : public ChoiceInterpreter class CAAutoExposureBracketingInterpreter : public ChoiceInterpreter<int>
{ {
public: public:
CAAutoExposureBracketingInterpreter() CAAutoExposureBracketingInterpreter()
@@ -1334,7 +1334,7 @@ public:
}; };
CAAutoExposureBracketingInterpreter caAutoExposureBracketingInterpreter; CAAutoExposureBracketingInterpreter caAutoExposureBracketingInterpreter;
class CAControModeInterpreter : public ChoiceInterpreter class CAControModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAControModeInterpreter() CAControModeInterpreter()
@@ -1370,7 +1370,7 @@ public:
}; };
CAMeasuredEVInterpreter caMeasuredEVInterpreter; CAMeasuredEVInterpreter caMeasuredEVInterpreter;
class CACameraTypeInterpreter : public ChoiceInterpreter class CACameraTypeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CACameraTypeInterpreter() CACameraTypeInterpreter()
@@ -1383,7 +1383,7 @@ public:
}; };
CACameraTypeInterpreter caCameraTypeInterpreter; CACameraTypeInterpreter caCameraTypeInterpreter;
class CAAutoRotateInterpreter : public ChoiceInterpreter class CAAutoRotateInterpreter : public ChoiceInterpreter<int>
{ {
public: public:
CAAutoRotateInterpreter() CAAutoRotateInterpreter()
@@ -1397,7 +1397,7 @@ public:
}; };
CAAutoRotateInterpreter caAutoRotateInterpreter; CAAutoRotateInterpreter caAutoRotateInterpreter;
class CABracketModeInterpreter : public ChoiceInterpreter class CABracketModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CABracketModeInterpreter() CABracketModeInterpreter()
@@ -1411,7 +1411,7 @@ public:
}; };
CABracketModeInterpreter caBracketModeInterpreter; CABracketModeInterpreter caBracketModeInterpreter;
class CARAWJpegQualityInterpreter : public ChoiceInterpreter class CARAWJpegQualityInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CARAWJpegQualityInterpreter() CARAWJpegQualityInterpreter()
@@ -1427,7 +1427,7 @@ public:
}; };
CARAWJpegQualityInterpreter caRAWJpegQualityInterpreter; CARAWJpegQualityInterpreter caRAWJpegQualityInterpreter;
class CAJpegSizeInterpreter : public ChoiceInterpreter class CAJpegSizeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAJpegSizeInterpreter() CAJpegSizeInterpreter()
@@ -1453,7 +1453,7 @@ public:
}; };
CAJpegSizeInterpreter caJpegSizeInterpreter; CAJpegSizeInterpreter caJpegSizeInterpreter;
class CAWBBracketModeInterpreter : public ChoiceInterpreter class CAWBBracketModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAWBBracketModeInterpreter() CAWBBracketModeInterpreter()
@@ -1465,7 +1465,7 @@ public:
}; };
CAWBBracketModeInterpreter caWBBracketModeInterpreter; CAWBBracketModeInterpreter caWBBracketModeInterpreter;
class CAFilterEffectInterpreter : public ChoiceInterpreter class CAFilterEffectInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAFilterEffectInterpreter() CAFilterEffectInterpreter()
@@ -1479,7 +1479,7 @@ public:
}; };
CAFilterEffectInterpreter caFilterEffectInterpreter; CAFilterEffectInterpreter caFilterEffectInterpreter;
class CAToningEffectInterpreter : public ChoiceInterpreter class CAToningEffectInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAToningEffectInterpreter() CAToningEffectInterpreter()
@@ -1507,7 +1507,7 @@ public:
CAFileNumberInterpreter caFileNumberInterpreter; CAFileNumberInterpreter caFileNumberInterpreter;
// CanonModelID // CanonModelID
class CAModelIDInterpreter : public ChoiceInterpreter class CAModelIDInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAModelIDInterpreter () CAModelIDInterpreter ()
@@ -1843,7 +1843,7 @@ public:
}; };
CAModelIDInterpreter caModelIDInterpreter; CAModelIDInterpreter caModelIDInterpreter;
class CAPanoramaDirectionInterpreter : public ChoiceInterpreter class CAPanoramaDirectionInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAPanoramaDirectionInterpreter() CAPanoramaDirectionInterpreter()
@@ -1857,7 +1857,7 @@ public:
}; };
CAPanoramaDirectionInterpreter caPanoramaDirectionInterpreter; CAPanoramaDirectionInterpreter caPanoramaDirectionInterpreter;
class CAAspectRatioInterpreter : public ChoiceInterpreter class CAAspectRatioInterpreter : public ChoiceInterpreter<>
{ {
public: public:
CAAspectRatioInterpreter() CAAspectRatioInterpreter()

28
rtexif/fujiattribs.cc
View File

@@ -24,7 +24,7 @@
namespace rtexif namespace rtexif
{ {
class FAOnOffInterpreter : public ChoiceInterpreter class FAOnOffInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FAOnOffInterpreter () FAOnOffInterpreter ()
@@ -35,7 +35,7 @@ public:
}; };
FAOnOffInterpreter faOnOffInterpreter; FAOnOffInterpreter faOnOffInterpreter;
class FASharpnessInterpreter : public ChoiceInterpreter class FASharpnessInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FASharpnessInterpreter () FASharpnessInterpreter ()
@@ -53,7 +53,7 @@ public:
}; };
FASharpnessInterpreter faSharpnessInterpreter; FASharpnessInterpreter faSharpnessInterpreter;
class FAWhiteBalanceInterpreter : public ChoiceInterpreter class FAWhiteBalanceInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FAWhiteBalanceInterpreter () FAWhiteBalanceInterpreter ()
@@ -79,7 +79,7 @@ public:
}; };
FAWhiteBalanceInterpreter faWhiteBalanceInterpreter; FAWhiteBalanceInterpreter faWhiteBalanceInterpreter;
class FASaturationInterpreter : public ChoiceInterpreter class FASaturationInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FASaturationInterpreter () FASaturationInterpreter ()
@@ -104,7 +104,7 @@ public:
}; };
FASaturationInterpreter faSaturationInterpreter; FASaturationInterpreter faSaturationInterpreter;
class FAContrastInterpreter : public ChoiceInterpreter class FAContrastInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FAContrastInterpreter () FAContrastInterpreter ()
@@ -119,7 +119,7 @@ public:
}; };
FAContrastInterpreter faContrastInterpreter; FAContrastInterpreter faContrastInterpreter;
class FAContrast2Interpreter : public ChoiceInterpreter class FAContrast2Interpreter : public ChoiceInterpreter<>
{ {
public: public:
FAContrast2Interpreter () FAContrast2Interpreter ()
@@ -131,7 +131,7 @@ public:
}; };
FAContrast2Interpreter faContrast2Interpreter; FAContrast2Interpreter faContrast2Interpreter;
class FANoiseReductionInterpreter : public ChoiceInterpreter class FANoiseReductionInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FANoiseReductionInterpreter () FANoiseReductionInterpreter ()
@@ -143,7 +143,7 @@ public:
}; };
FANoiseReductionInterpreter faNoiseReductionInterpreter; FANoiseReductionInterpreter faNoiseReductionInterpreter;
class FAFlashInterpreter : public ChoiceInterpreter class FAFlashInterpreter : public ChoiceInterpreter<>
{ {
public: public:
// FujiFlashMode // FujiFlashMode
@@ -158,7 +158,7 @@ public:
}; };
FAFlashInterpreter faFlashInterpreter; FAFlashInterpreter faFlashInterpreter;
class FAFocusModeInterpreter : public ChoiceInterpreter class FAFocusModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FAFocusModeInterpreter () FAFocusModeInterpreter ()
@@ -169,7 +169,7 @@ public:
}; };
FAFocusModeInterpreter faFocusModeInterpreter; FAFocusModeInterpreter faFocusModeInterpreter;
class FAColorModeInterpreter : public ChoiceInterpreter class FAColorModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FAColorModeInterpreter () FAColorModeInterpreter ()
@@ -181,7 +181,7 @@ public:
}; };
FAColorModeInterpreter faColorModeInterpreter; FAColorModeInterpreter faColorModeInterpreter;
class FADynamicRangeInterpreter : public ChoiceInterpreter class FADynamicRangeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FADynamicRangeInterpreter () FADynamicRangeInterpreter ()
@@ -192,7 +192,7 @@ public:
}; };
FADynamicRangeInterpreter faDynamicRangeInterpreter; FADynamicRangeInterpreter faDynamicRangeInterpreter;
class FAFilmModeInterpreter : public ChoiceInterpreter class FAFilmModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FAFilmModeInterpreter () FAFilmModeInterpreter ()
@@ -212,7 +212,7 @@ public:
}; };
FAFilmModeInterpreter faFilmModeInterpreter; FAFilmModeInterpreter faFilmModeInterpreter;
class FADRSettingInterpreter : public ChoiceInterpreter class FADRSettingInterpreter : public ChoiceInterpreter<>
{ {
public: public:
// DynamicRangeSetting // DynamicRangeSetting
@@ -228,7 +228,7 @@ public:
}; };
FADRSettingInterpreter faDRSettingInterpreter; FADRSettingInterpreter faDRSettingInterpreter;
class FAPictureModeInterpreter : public ChoiceInterpreter class FAPictureModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
FAPictureModeInterpreter () FAPictureModeInterpreter ()

4
rtexif/nikonattribs.cc
View File

@@ -155,7 +155,7 @@ public:
}; };
NALensTypeInterpreter naLensTypeInterpreter; NALensTypeInterpreter naLensTypeInterpreter;
class NAFlashModeInterpreter : public ChoiceInterpreter class NAFlashModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
NAFlashModeInterpreter () NAFlashModeInterpreter ()
@@ -170,7 +170,7 @@ public:
}; };
NAFlashModeInterpreter naFlashModeInterpreter; NAFlashModeInterpreter naFlashModeInterpreter;
class NAHiISONRInterpreter : public ChoiceInterpreter class NAHiISONRInterpreter : public ChoiceInterpreter<>
{ {
public: public:
// HighISONoiseReduction // HighISONoiseReduction

26
rtexif/olympusattribs.cc
View File

@@ -214,7 +214,7 @@ public:
}; };
OLLensTypeInterpreter olLensTypeInterpreter; OLLensTypeInterpreter olLensTypeInterpreter;
class OLFlashTypeInterpreter : public ChoiceInterpreter class OLFlashTypeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OLFlashTypeInterpreter () OLFlashTypeInterpreter ()
@@ -226,7 +226,7 @@ public:
}; };
OLFlashTypeInterpreter olFlashTypeInterpreter; OLFlashTypeInterpreter olFlashTypeInterpreter;
class OLExposureModeInterpreter : public ChoiceInterpreter class OLExposureModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OLExposureModeInterpreter () OLExposureModeInterpreter ()
@@ -240,7 +240,7 @@ public:
}; };
OLExposureModeInterpreter olExposureModeInterpreter; OLExposureModeInterpreter olExposureModeInterpreter;
class OLMeteringModeInterpreter : public ChoiceInterpreter class OLMeteringModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OLMeteringModeInterpreter () OLMeteringModeInterpreter ()
@@ -255,7 +255,7 @@ public:
}; };
OLMeteringModeInterpreter olMeteringModeInterpreter; OLMeteringModeInterpreter olMeteringModeInterpreter;
class OLFocusModeInterpreter : public ChoiceInterpreter class OLFocusModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OLFocusModeInterpreter () OLFocusModeInterpreter ()
@@ -270,7 +270,7 @@ public:
}; };
OLFocusModeInterpreter olFocusModeInterpreter; OLFocusModeInterpreter olFocusModeInterpreter;
class OLWhitebalance2Interpreter : public ChoiceInterpreter class OLWhitebalance2Interpreter : public ChoiceInterpreter<>
{ {
public: public:
OLWhitebalance2Interpreter () OLWhitebalance2Interpreter ()
@@ -302,7 +302,7 @@ public:
}; };
OLWhitebalance2Interpreter olWhitebalance2Interpreter; OLWhitebalance2Interpreter olWhitebalance2Interpreter;
class OLSceneModeInterpreter : public ChoiceInterpreter class OLSceneModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OLSceneModeInterpreter () OLSceneModeInterpreter ()
@@ -368,7 +368,7 @@ public:
}; };
OLSceneModeInterpreter olSceneModeInterpreter; OLSceneModeInterpreter olSceneModeInterpreter;
class OLPictureModeBWFilterInterpreter : public ChoiceInterpreter class OLPictureModeBWFilterInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OLPictureModeBWFilterInterpreter () OLPictureModeBWFilterInterpreter ()
@@ -383,7 +383,7 @@ public:
}; };
OLPictureModeBWFilterInterpreter olPictureModeBWFilterInterpreter; OLPictureModeBWFilterInterpreter olPictureModeBWFilterInterpreter;
class OLPictureModeToneInterpreter : public ChoiceInterpreter class OLPictureModeToneInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OLPictureModeToneInterpreter () OLPictureModeToneInterpreter ()
@@ -398,7 +398,7 @@ public:
}; };
OLPictureModeToneInterpreter olPictureModeToneInterpreter; OLPictureModeToneInterpreter olPictureModeToneInterpreter;
class OLImageQuality2Interpreter : public ChoiceInterpreter class OLImageQuality2Interpreter : public ChoiceInterpreter<>
{ {
public: public:
OLImageQuality2Interpreter () OLImageQuality2Interpreter ()
@@ -412,7 +412,7 @@ public:
}; };
OLImageQuality2Interpreter olImageQuality2Interpreter; OLImageQuality2Interpreter olImageQuality2Interpreter;
class OLDevEngineInterpreter : public ChoiceInterpreter class OLDevEngineInterpreter : public ChoiceInterpreter<>
{ {
public: public:
// RawDevEngine // RawDevEngine
@@ -426,7 +426,7 @@ public:
}; };
OLDevEngineInterpreter olDevEngineInterpreter; OLDevEngineInterpreter olDevEngineInterpreter;
class OLPictureModeInterpreter : public ChoiceInterpreter class OLPictureModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OLPictureModeInterpreter () OLPictureModeInterpreter ()
@@ -449,7 +449,7 @@ public:
}; };
OLPictureModeInterpreter olPictureModeInterpreter; OLPictureModeInterpreter olPictureModeInterpreter;
class OLColorSpaceInterpreter : public ChoiceInterpreter class OLColorSpaceInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OLColorSpaceInterpreter () OLColorSpaceInterpreter ()
@@ -522,7 +522,7 @@ public:
}; };
OLNoiseReductionInterpreter olNoiseReductionInterpreter; OLNoiseReductionInterpreter olNoiseReductionInterpreter;
class OLFlashModelInterpreter : public ChoiceInterpreter class OLFlashModelInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OLFlashModelInterpreter () OLFlashModelInterpreter ()

92
rtexif/pentaxattribs.cc
View File

@@ -31,7 +31,7 @@ namespace rtexif
{ {
class PAQualityInterpreter : public ChoiceInterpreter class PAQualityInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAQualityInterpreter () PAQualityInterpreter ()
@@ -50,7 +50,7 @@ public:
}; };
PAQualityInterpreter paQualityInterpreter; PAQualityInterpreter paQualityInterpreter;
class PAOnOffInterpreter : public ChoiceInterpreter class PAOnOffInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAOnOffInterpreter () PAOnOffInterpreter ()
@@ -61,7 +61,7 @@ public:
}; };
PAOnOffInterpreter paOnOffInterpreter; PAOnOffInterpreter paOnOffInterpreter;
class PAShakeReductionInterpreter : public ChoiceInterpreter class PAShakeReductionInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAShakeReductionInterpreter () PAShakeReductionInterpreter ()
@@ -80,7 +80,7 @@ public:
}; };
PAShakeReductionInterpreter paShakeReductionInterpreter; PAShakeReductionInterpreter paShakeReductionInterpreter;
class PAShakeReduction2Interpreter : public ChoiceInterpreter class PAShakeReduction2Interpreter : public ChoiceInterpreter<>
{ {
public: public:
// ShakeReduction // ShakeReduction
@@ -100,7 +100,7 @@ public:
}; };
PAShakeReduction2Interpreter paShakeReduction2Interpreter; PAShakeReduction2Interpreter paShakeReduction2Interpreter;
class PAPictureModeInterpreter : public ChoiceInterpreter class PAPictureModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAPictureModeInterpreter () PAPictureModeInterpreter ()
@@ -164,7 +164,7 @@ public:
}; };
PAPictureModeInterpreter paPictureModeInterpreter; PAPictureModeInterpreter paPictureModeInterpreter;
class PASceneModeInterpreter : public ChoiceInterpreter class PASceneModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PASceneModeInterpreter () PASceneModeInterpreter ()
@@ -196,7 +196,7 @@ public:
}; };
PASceneModeInterpreter paSceneModeInterpreter; PASceneModeInterpreter paSceneModeInterpreter;
class PAAEProgramModeInterpreter : public ChoiceInterpreter class PAAEProgramModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAAEProgramModeInterpreter () PAAEProgramModeInterpreter ()
@@ -235,7 +235,7 @@ public:
}; };
PAAEProgramModeInterpreter paAEProgramModeInterpreter; PAAEProgramModeInterpreter paAEProgramModeInterpreter;
class PAFlashModeInterpreter : public ChoiceInterpreter class PAFlashModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAFlashModeInterpreter () PAFlashModeInterpreter ()
@@ -259,7 +259,7 @@ public:
}; };
PAFlashModeInterpreter paFlashModeInterpreter; PAFlashModeInterpreter paFlashModeInterpreter;
class PAFocusModeInterpreter : public ChoiceInterpreter class PAFocusModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAFocusModeInterpreter () PAFocusModeInterpreter ()
@@ -283,7 +283,7 @@ public:
}; };
PAFocusModeInterpreter paFocusModeInterpreter; PAFocusModeInterpreter paFocusModeInterpreter;
class PAAFPointInterpreter : public ChoiceInterpreter class PAAFPointInterpreter : public ChoiceInterpreter<>
{ {
public: public:
// AFPointSelected // AFPointSelected
@@ -310,7 +310,7 @@ public:
}; };
PAAFPointInterpreter paAFPointInterpreter; PAAFPointInterpreter paAFPointInterpreter;
class PAAFFocusInterpreter : public ChoiceInterpreter class PAAFFocusInterpreter : public ChoiceInterpreter<>
{ {
public: public:
// AFPointsInFocus // AFPointsInFocus
@@ -331,7 +331,7 @@ public:
}; };
PAAFFocusInterpreter paAFFocusInterpreter; PAAFFocusInterpreter paAFFocusInterpreter;
class PAISOInterpreter : public ChoiceInterpreter class PAISOInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAISOInterpreter () PAISOInterpreter ()
@@ -430,7 +430,7 @@ public:
}; };
PAFNumberInterpreter paFNumberInterpreter; PAFNumberInterpreter paFNumberInterpreter;
class PAMeteringModeInterpreter : public ChoiceInterpreter class PAMeteringModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAMeteringModeInterpreter () PAMeteringModeInterpreter ()
@@ -442,7 +442,7 @@ public:
}; };
PAMeteringModeInterpreter paMeteringModeInterpreter; PAMeteringModeInterpreter paMeteringModeInterpreter;
class PAWhiteBalanceInterpreter : public ChoiceInterpreter class PAWhiteBalanceInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAWhiteBalanceInterpreter () PAWhiteBalanceInterpreter ()
@@ -468,7 +468,7 @@ public:
}; };
PAWhiteBalanceInterpreter paWhiteBalanceInterpreter; PAWhiteBalanceInterpreter paWhiteBalanceInterpreter;
class PAWhiteBalanceModeInterpreter : public ChoiceInterpreter class PAWhiteBalanceModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAWhiteBalanceModeInterpreter () PAWhiteBalanceModeInterpreter ()
@@ -487,7 +487,7 @@ public:
}; };
PAWhiteBalanceModeInterpreter paWhiteBalanceModeInterpreter; PAWhiteBalanceModeInterpreter paWhiteBalanceModeInterpreter;
class PASaturationInterpreter : public ChoiceInterpreter class PASaturationInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PASaturationInterpreter () PASaturationInterpreter ()
@@ -506,7 +506,7 @@ public:
}; };
PASaturationInterpreter paSaturationInterpreter; PASaturationInterpreter paSaturationInterpreter;
class PAContrastInterpreter : public ChoiceInterpreter class PAContrastInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PAContrastInterpreter () PAContrastInterpreter ()
@@ -525,7 +525,7 @@ public:
}; };
PAContrastInterpreter paContrastInterpreter; PAContrastInterpreter paContrastInterpreter;
class PASharpnessInterpreter : public ChoiceInterpreter class PASharpnessInterpreter : public ChoiceInterpreter<>
{ {
public: public:
PASharpnessInterpreter () PASharpnessInterpreter ()
@@ -543,7 +543,7 @@ public:
}; };
PASharpnessInterpreter paSharpnessInterpreter; PASharpnessInterpreter paSharpnessInterpreter;
class PAPictureModeInterpreter2: public ChoiceInterpreter class PAPictureModeInterpreter2: public ChoiceInterpreter<>
{ {
public: public:
PAPictureModeInterpreter2() PAPictureModeInterpreter2()
@@ -613,7 +613,7 @@ public:
std::string toString (Tag* t) override std::string toString (Tag* t) override
{ {
int c = 256 * t->toInt (0, BYTE) + t->toInt (1, BYTE); int c = 256 * t->toInt (0, BYTE) + t->toInt (1, BYTE);
std::map<int, std::string>::iterator r = choices.find (c); const ChoicesIterator r = choices.find (c);
if (r != choices.end()) { if (r != choices.end()) {
std::ostringstream s; std::ostringstream s;
@@ -635,7 +635,7 @@ public:
}; };
PAPictureModeInterpreter2 paPictureModeInterpreter2; PAPictureModeInterpreter2 paPictureModeInterpreter2;
class PADriveModeInterpreter : public ChoiceInterpreter class PADriveModeInterpreter : public ChoiceInterpreter<>
{ {
std::map<int, std::string> choices1; std::map<int, std::string> choices1;
std::map<int, std::string> choices2; std::map<int, std::string> choices2;
@@ -671,7 +671,7 @@ public:
} }
std::string toString (Tag* t) override std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE)); const ChoicesIterator r = choices.find (t->toInt (0, BYTE));
std::map<int, std::string>::iterator r1 = choices1.find (t->toInt (1, BYTE)); std::map<int, std::string>::iterator r1 = choices1.find (t->toInt (1, BYTE));
std::map<int, std::string>::iterator r2 = choices2.find (t->toInt (2, BYTE)); std::map<int, std::string>::iterator r2 = choices2.find (t->toInt (2, BYTE));
std::map<int, std::string>::iterator r3 = choices3.find (t->toInt (3, BYTE)); std::map<int, std::string>::iterator r3 = choices3.find (t->toInt (3, BYTE));
@@ -685,7 +685,7 @@ public:
}; };
PADriveModeInterpreter paDriveModeInterpreter; PADriveModeInterpreter paDriveModeInterpreter;
class PAColorSpaceInterpreter: public ChoiceInterpreter class PAColorSpaceInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAColorSpaceInterpreter() PAColorSpaceInterpreter()
@@ -1079,7 +1079,7 @@ public:
}; };
PASRResultInterpreter paSRResultInterpreter; PASRResultInterpreter paSRResultInterpreter;
class PAHighISONoiseInterpreter: public ChoiceInterpreter class PAHighISONoiseInterpreter: public ChoiceInterpreter<>
{ {
public: public:
// HighISONoiseReduction // HighISONoiseReduction
@@ -1095,7 +1095,7 @@ public:
}; };
PAHighISONoiseInterpreter paHighISONoiseInterpreter; PAHighISONoiseInterpreter paHighISONoiseInterpreter;
class PAMonochromeFilterEffectInterpreter: public ChoiceInterpreter class PAMonochromeFilterEffectInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAMonochromeFilterEffectInterpreter() PAMonochromeFilterEffectInterpreter()
@@ -1113,7 +1113,7 @@ public:
}; };
PAMonochromeFilterEffectInterpreter paMonochromeFilterEffectInterpreter; PAMonochromeFilterEffectInterpreter paMonochromeFilterEffectInterpreter;
class PAMonochromeToningInterpreter: public ChoiceInterpreter class PAMonochromeToningInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAMonochromeToningInterpreter() PAMonochromeToningInterpreter()
@@ -1132,7 +1132,7 @@ public:
}; };
PAMonochromeToningInterpreter paMonochromeToningInterpreter; PAMonochromeToningInterpreter paMonochromeToningInterpreter;
class PAShadowCorrectionInterpreter: public ChoiceInterpreter class PAShadowCorrectionInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAShadowCorrectionInterpreter() PAShadowCorrectionInterpreter()
@@ -1156,7 +1156,7 @@ public:
idx = t->toInt (0, BYTE) << 8 | t->toInt (1, BYTE); idx = t->toInt (0, BYTE) << 8 | t->toInt (1, BYTE);
} }
std::map<int, std::string>::iterator r = choices.find (idx); const ChoicesIterator r = choices.find (idx);
std::ostringstream s; std::ostringstream s;
s << ((r != choices.end()) ? r->second : "n/a"); s << ((r != choices.end()) ? r->second : "n/a");
return s.str(); return s.str();
@@ -1164,7 +1164,7 @@ public:
}; };
PAShadowCorrectionInterpreter paShadowCorrectionInterpreter; PAShadowCorrectionInterpreter paShadowCorrectionInterpreter;
class PAISOAutoParametersInterpreter: public ChoiceInterpreter class PAISOAutoParametersInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAISOAutoParametersInterpreter() PAISOAutoParametersInterpreter()
@@ -1175,7 +1175,7 @@ public:
} }
std::string toString (Tag* t) override std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE)); const ChoicesIterator r = choices.find (t->toInt (0, BYTE));
std::ostringstream s; std::ostringstream s;
s << ((r != choices.end()) ? r->second : "n/a"); s << ((r != choices.end()) ? r->second : "n/a");
return s.str(); return s.str();
@@ -1183,7 +1183,7 @@ public:
}; };
PAISOAutoParametersInterpreter paISOAutoParametersInterpreter; PAISOAutoParametersInterpreter paISOAutoParametersInterpreter;
class PABleachBypassToningInterpreter: public ChoiceInterpreter class PABleachBypassToningInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PABleachBypassToningInterpreter() PABleachBypassToningInterpreter()
@@ -1201,7 +1201,7 @@ public:
}; };
PABleachBypassToningInterpreter paBleachBypassToningInterpreter; PABleachBypassToningInterpreter paBleachBypassToningInterpreter;
class PABlurControlInterpreter: public ChoiceInterpreter class PABlurControlInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PABlurControlInterpreter() PABlurControlInterpreter()
@@ -1213,7 +1213,7 @@ public:
} }
std::string toString (Tag* t) override std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE)); const ChoicesIterator r = choices.find (t->toInt (0, BYTE));
std::ostringstream s; std::ostringstream s;
s << ((r != choices.end()) ? r->second : "n/a"); s << ((r != choices.end()) ? r->second : "n/a");
return s.str(); return s.str();
@@ -1221,7 +1221,7 @@ public:
}; };
PABlurControlInterpreter paBlurControlInterpreter; PABlurControlInterpreter paBlurControlInterpreter;
class PAHDRInterpreter: public ChoiceInterpreter class PAHDRInterpreter: public ChoiceInterpreter<>
{ {
std::map<int, std::string> choices1; std::map<int, std::string> choices1;
std::map<int, std::string> choices2; std::map<int, std::string> choices2;
@@ -1245,7 +1245,7 @@ public:
} }
std::string toString (Tag* t) override std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE)); const ChoicesIterator r = choices.find (t->toInt (0, BYTE));
std::map<int, std::string>::iterator r1 = choices1.find (t->toInt (1, BYTE)); std::map<int, std::string>::iterator r1 = choices1.find (t->toInt (1, BYTE));
std::map<int, std::string>::iterator r2 = choices2.find (t->toInt (2, BYTE)); std::map<int, std::string>::iterator r2 = choices2.find (t->toInt (2, BYTE));
std::ostringstream s; std::ostringstream s;
@@ -1257,7 +1257,7 @@ public:
}; };
PAHDRInterpreter paHDRInterpreter; PAHDRInterpreter paHDRInterpreter;
class PACrossProcessInterpreter: public ChoiceInterpreter class PACrossProcessInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PACrossProcessInterpreter() PACrossProcessInterpreter()
@@ -1274,7 +1274,7 @@ public:
}; };
PACrossProcessInterpreter paCrossProcessInterpreter; PACrossProcessInterpreter paCrossProcessInterpreter;
class PAPowerSourceInterpreter: public ChoiceInterpreter class PAPowerSourceInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAPowerSourceInterpreter() PAPowerSourceInterpreter()
@@ -1592,7 +1592,7 @@ public:
}; };
PANominalMaxApertureInterpreter paNominalMaxApertureInterpreter; PANominalMaxApertureInterpreter paNominalMaxApertureInterpreter;
class PAFlashStatusInterpreter: public ChoiceInterpreter class PAFlashStatusInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAFlashStatusInterpreter() PAFlashStatusInterpreter()
@@ -1608,7 +1608,7 @@ public:
}; };
PAFlashStatusInterpreter paFlashStatusInterpreter; PAFlashStatusInterpreter paFlashStatusInterpreter;
class PAInternalFlashModeInterpreter: public ChoiceInterpreter class PAInternalFlashModeInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAInternalFlashModeInterpreter() PAInternalFlashModeInterpreter()
@@ -1638,7 +1638,7 @@ public:
}; };
PAInternalFlashModeInterpreter paInternalFlashModeInterpreter; PAInternalFlashModeInterpreter paInternalFlashModeInterpreter;
class PAExternalFlashModeInterpreter: public ChoiceInterpreter class PAExternalFlashModeInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAExternalFlashModeInterpreter() PAExternalFlashModeInterpreter()
@@ -1658,7 +1658,7 @@ public:
}; };
PAExternalFlashModeInterpreter paExternalFlashModeInterpreter; PAExternalFlashModeInterpreter paExternalFlashModeInterpreter;
class PAExternalFlashExposureCompInterpreter: public ChoiceInterpreter class PAExternalFlashExposureCompInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAExternalFlashExposureCompInterpreter() PAExternalFlashExposureCompInterpreter()
@@ -1678,7 +1678,7 @@ public:
}; };
PAExternalFlashExposureCompInterpreter paExternalFlashExposureCompInterpreter; PAExternalFlashExposureCompInterpreter paExternalFlashExposureCompInterpreter;
class PAExternalFlashBounceInterpreter: public ChoiceInterpreter class PAExternalFlashBounceInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAExternalFlashBounceInterpreter() PAExternalFlashBounceInterpreter()
@@ -1761,7 +1761,7 @@ public:
}; };
PAApertureRingUseInterpreter paApertureRingUseInterpreter; PAApertureRingUseInterpreter paApertureRingUseInterpreter;
class PAFlashOptionInterpreter: public ChoiceInterpreter class PAFlashOptionInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAFlashOptionInterpreter() PAFlashOptionInterpreter()
@@ -1778,7 +1778,7 @@ public:
} }
std::string toString (Tag* t) override std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE) >> 4); const ChoicesIterator r = choices.find (t->toInt (0, BYTE) >> 4);
if (r != choices.end()) { if (r != choices.end()) {
return r->second; return r->second;
@@ -1813,7 +1813,7 @@ public:
}; };
PAMeteringMode2Interpreter paMeteringMode2Interpreter; PAMeteringMode2Interpreter paMeteringMode2Interpreter;
class PAExposureBracketStepSizeInterpreter: public ChoiceInterpreter class PAExposureBracketStepSizeInterpreter: public ChoiceInterpreter<>
{ {
public: public:
PAExposureBracketStepSizeInterpreter() PAExposureBracketStepSizeInterpreter()
@@ -1830,7 +1830,7 @@ public:
}; };
PAExposureBracketStepSizeInterpreter paExposureBracketStepSizeInterpreter; PAExposureBracketStepSizeInterpreter paExposureBracketStepSizeInterpreter;
class PAPictureMode2Interpreter: public ChoiceInterpreter class PAPictureMode2Interpreter: public ChoiceInterpreter<>
{ {
public: public:
PAPictureMode2Interpreter() PAPictureMode2Interpreter()

27
rtexif/rtexif.h
View File

@@ -19,15 +19,16 @@
#ifndef _MEXIF3_ #ifndef _MEXIF3_
#define _MEXIF3_ #define _MEXIF3_
#include <cstdio>
#include <vector>
#include <map>
#include <string>
#include <sstream>
#include <iomanip>
#include <cstdlib>
#include <cmath> #include <cmath>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
#include <iomanip>
#include <map>
#include <memory> #include <memory>
#include <sstream>
#include <string>
#include <vector>
#include <glibmm.h> #include <glibmm.h>
@@ -482,22 +483,26 @@ public:
}; };
extern Interpreter stdInterpreter; extern Interpreter stdInterpreter;
template<typename T = std::uint32_t>
class ChoiceInterpreter : public Interpreter class ChoiceInterpreter : public Interpreter
{ {
protected: protected:
std::map<int, std::string> choices; using Choices = std::map<T, std::string>;
using ChoicesIterator = typename Choices::const_iterator;
Choices choices;
public: public:
ChoiceInterpreter () {}; ChoiceInterpreter () {};
std::string toString (Tag* t) override std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt()); const typename std::map<T, std::string>::const_iterator r = choices.find(t->toInt());
if (r != choices.end()) { if (r != choices.end()) {
return r->second; return r->second;
} else { } else {
char buffer[1024]; char buffer[1024];
t->toString (buffer); t->toString(buffer);
return std::string (buffer); return buffer;
} }
} }
}; };

152
rtexif/sonyminoltaattribs.cc
View File

@@ -25,7 +25,7 @@
namespace rtexif namespace rtexif
{ {
class SANoYesInterpreter : public ChoiceInterpreter class SANoYesInterpreter : public ChoiceInterpreter<>
{ {
public: public:
SANoYesInterpreter () SANoYesInterpreter ()
@@ -36,7 +36,7 @@ public:
}; };
SANoYesInterpreter saNoYesInterpreter; SANoYesInterpreter saNoYesInterpreter;
class SAOnOffInterpreter : public ChoiceInterpreter class SAOnOffInterpreter : public ChoiceInterpreter<>
{ {
public: public:
SAOnOffInterpreter () SAOnOffInterpreter ()
@@ -48,7 +48,7 @@ public:
}; };
SAOnOffInterpreter saOnOffInterpreter; SAOnOffInterpreter saOnOffInterpreter;
class SAOnOffInterpreter2 : public ChoiceInterpreter class SAOnOffInterpreter2 : public ChoiceInterpreter<>
{ {
public: public:
SAOnOffInterpreter2 () SAOnOffInterpreter2 ()
@@ -59,7 +59,7 @@ public:
}; };
SAOnOffInterpreter2 saOnOffInterpreter2; SAOnOffInterpreter2 saOnOffInterpreter2;
class SAOnOffInterpreter3 : public ChoiceInterpreter class SAOnOffInterpreter3 : public ChoiceInterpreter<>
{ {
public: public:
SAOnOffInterpreter3 () SAOnOffInterpreter3 ()
@@ -71,7 +71,7 @@ public:
}; };
SAOnOffInterpreter3 saOnOffInterpreter3; SAOnOffInterpreter3 saOnOffInterpreter3;
class SAOnOffInterpreter4 : public ChoiceInterpreter class SAOnOffInterpreter4 : public ChoiceInterpreter<>
{ {
public: public:
SAOnOffInterpreter4 () SAOnOffInterpreter4 ()
@@ -84,7 +84,7 @@ public:
}; };
SAOnOffInterpreter4 saOnOffInterpreter4; SAOnOffInterpreter4 saOnOffInterpreter4;
class SAOnOffInterpreter5 : public ChoiceInterpreter class SAOnOffInterpreter5 : public ChoiceInterpreter<>
{ {
public: public:
SAOnOffInterpreter5 () SAOnOffInterpreter5 ()
@@ -95,7 +95,7 @@ public:
}; };
SAOnOffInterpreter5 saOnOffInterpreter5; SAOnOffInterpreter5 saOnOffInterpreter5;
class SAHighISONoiseReduction : public ChoiceInterpreter class SAHighISONoiseReduction : public ChoiceInterpreter<>
{ {
public: public:
SAHighISONoiseReduction () SAHighISONoiseReduction ()
@@ -110,7 +110,7 @@ public:
}; };
SAHighISONoiseReduction saHighISONoiseReduction; SAHighISONoiseReduction saHighISONoiseReduction;
class SAHighISONoiseReduction2 : public ChoiceInterpreter class SAHighISONoiseReduction2 : public ChoiceInterpreter<>
{ {
public: public:
SAHighISONoiseReduction2 () SAHighISONoiseReduction2 ()
@@ -124,7 +124,7 @@ public:
}; };
SAHighISONoiseReduction2 saHighISONoiseReduction2; SAHighISONoiseReduction2 saHighISONoiseReduction2;
class SAHighISONoiseReduction3 : public ChoiceInterpreter class SAHighISONoiseReduction3 : public ChoiceInterpreter<>
{ {
public: public:
SAHighISONoiseReduction3 () SAHighISONoiseReduction3 ()
@@ -137,7 +137,7 @@ public:
}; };
SAHighISONoiseReduction3 saHighISONoiseReduction3; SAHighISONoiseReduction3 saHighISONoiseReduction3;
class SAHighISONoiseReduction4 : public ChoiceInterpreter class SAHighISONoiseReduction4 : public ChoiceInterpreter<>
{ {
public: public:
SAHighISONoiseReduction4 () SAHighISONoiseReduction4 ()
@@ -150,7 +150,7 @@ public:
}; };
SAHighISONoiseReduction4 saHighISONoiseReduction4; SAHighISONoiseReduction4 saHighISONoiseReduction4;
class SAHighISONoiseReduction5 : public ChoiceInterpreter class SAHighISONoiseReduction5 : public ChoiceInterpreter<>
{ {
public: public:
SAHighISONoiseReduction5 () SAHighISONoiseReduction5 ()
@@ -161,7 +161,7 @@ public:
}; };
SAHighISONoiseReduction5 saHighISONoiseReduction5; SAHighISONoiseReduction5 saHighISONoiseReduction5;
class SASmileShutterMode : public ChoiceInterpreter class SASmileShutterMode : public ChoiceInterpreter<>
{ {
public: public:
SASmileShutterMode () SASmileShutterMode ()
@@ -173,7 +173,7 @@ public:
}; };
SASmileShutterMode saSmileShutterMode; SASmileShutterMode saSmileShutterMode;
class SAHDRLevel : public ChoiceInterpreter class SAHDRLevel : public ChoiceInterpreter<>
{ {
public: public:
SAHDRLevel () SAHDRLevel ()
@@ -191,7 +191,7 @@ public:
}; };
SAHDRLevel saHDRLevel; SAHDRLevel saHDRLevel;
class SAViewingMode : public ChoiceInterpreter class SAViewingMode : public ChoiceInterpreter<>
{ {
public: public:
SAViewingMode () SAViewingMode ()
@@ -204,7 +204,7 @@ public:
}; };
SAViewingMode saViewingMode; SAViewingMode saViewingMode;
class SAFlashAction : public ChoiceInterpreter class SAFlashAction : public ChoiceInterpreter<>
{ {
public: public:
SAFlashAction () SAFlashAction ()
@@ -215,7 +215,7 @@ public:
}; };
SAFlashAction saFlashAction; SAFlashAction saFlashAction;
class SALiveViewFocusMode : public ChoiceInterpreter class SALiveViewFocusMode : public ChoiceInterpreter<>
{ {
public: public:
SALiveViewFocusMode () SALiveViewFocusMode ()
@@ -227,7 +227,7 @@ public:
}; };
SALiveViewFocusMode saLiveViewFocusMode; SALiveViewFocusMode saLiveViewFocusMode;
class SALensMount : public ChoiceInterpreter class SALensMount : public ChoiceInterpreter<>
{ {
public: public:
SALensMount () SALensMount ()
@@ -239,7 +239,7 @@ public:
}; };
SALensMount saLensMount; SALensMount saLensMount;
class SASweepPanoramaSize : public ChoiceInterpreter class SASweepPanoramaSize : public ChoiceInterpreter<>
{ {
public: public:
SASweepPanoramaSize () SASweepPanoramaSize ()
@@ -250,7 +250,7 @@ public:
}; };
SASweepPanoramaSize saSweepPanoramaSize; SASweepPanoramaSize saSweepPanoramaSize;
class SASweepPanoramaDirection : public ChoiceInterpreter class SASweepPanoramaDirection : public ChoiceInterpreter<>
{ {
public: public:
SASweepPanoramaDirection () SASweepPanoramaDirection ()
@@ -263,7 +263,7 @@ public:
}; };
SASweepPanoramaDirection saSweepPanoramaDirection; SASweepPanoramaDirection saSweepPanoramaDirection;
class SALiveViewAFSetting : public ChoiceInterpreter class SALiveViewAFSetting : public ChoiceInterpreter<>
{ {
public: public:
SALiveViewAFSetting () SALiveViewAFSetting ()
@@ -275,7 +275,7 @@ public:
}; };
SALiveViewAFSetting saLiveViewAFSetting; SALiveViewAFSetting saLiveViewAFSetting;
class SAPanoramaSize3D : public ChoiceInterpreter class SAPanoramaSize3D : public ChoiceInterpreter<>
{ {
public: public:
SAPanoramaSize3D () SAPanoramaSize3D ()
@@ -288,7 +288,7 @@ public:
}; };
SAPanoramaSize3D saPanoramaSize3D; SAPanoramaSize3D saPanoramaSize3D;
class SALiveViewMetering : public ChoiceInterpreter class SALiveViewMetering : public ChoiceInterpreter<>
{ {
public: public:
SALiveViewMetering () SALiveViewMetering ()
@@ -300,7 +300,7 @@ public:
}; };
SALiveViewMetering saLiveViewMetering; SALiveViewMetering saLiveViewMetering;
class SAWhiteBalanceInterpreter: public ChoiceInterpreter class SAWhiteBalanceInterpreter: public ChoiceInterpreter<>
{ {
public: public:
SAWhiteBalanceInterpreter() SAWhiteBalanceInterpreter()
@@ -319,7 +319,7 @@ public:
}; };
SAWhiteBalanceInterpreter saWhiteBalanceInterpreter; SAWhiteBalanceInterpreter saWhiteBalanceInterpreter;
class SAWhiteBalanceSettingInterpreter: public ChoiceInterpreter class SAWhiteBalanceSettingInterpreter: public ChoiceInterpreter<>
{ {
public: public:
SAWhiteBalanceSettingInterpreter() SAWhiteBalanceSettingInterpreter()
@@ -379,7 +379,7 @@ public:
}; };
SAWhiteBalanceSettingInterpreter saWhiteBalanceSettingInterpreter; SAWhiteBalanceSettingInterpreter saWhiteBalanceSettingInterpreter;
class SASceneModeInterpreter : public ChoiceInterpreter class SASceneModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
SASceneModeInterpreter () SASceneModeInterpreter ()
@@ -413,7 +413,7 @@ public:
}; };
SASceneModeInterpreter saSceneModeInterpreter; SASceneModeInterpreter saSceneModeInterpreter;
class SAZoneMatchingInterpreter : public ChoiceInterpreter class SAZoneMatchingInterpreter : public ChoiceInterpreter<>
{ {
public: public:
SAZoneMatchingInterpreter () SAZoneMatchingInterpreter ()
@@ -425,7 +425,7 @@ public:
}; };
SAZoneMatchingInterpreter saZoneMatchingInterpreter; SAZoneMatchingInterpreter saZoneMatchingInterpreter;
class SADynamicRangeOptimizerInterpreter : public ChoiceInterpreter class SADynamicRangeOptimizerInterpreter : public ChoiceInterpreter<>
{ {
public: public:
SADynamicRangeOptimizerInterpreter () SADynamicRangeOptimizerInterpreter ()
@@ -448,7 +448,7 @@ public:
}; };
SADynamicRangeOptimizerInterpreter saDynamicRangeOptimizerInterpreter; SADynamicRangeOptimizerInterpreter saDynamicRangeOptimizerInterpreter;
class SAColorModeInterpreter : public ChoiceInterpreter class SAColorModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
SAColorModeInterpreter () SAColorModeInterpreter ()
@@ -477,7 +477,7 @@ public:
}; };
SAColorModeInterpreter saColorModeInterpreter; SAColorModeInterpreter saColorModeInterpreter;
class SAExposureModeInterpreter : public ChoiceInterpreter class SAExposureModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
SAExposureModeInterpreter () SAExposureModeInterpreter ()
@@ -517,7 +517,7 @@ public:
}; };
SAExposureModeInterpreter saExposureModeInterpreter; SAExposureModeInterpreter saExposureModeInterpreter;
class SAQualityInterpreter : public ChoiceInterpreter class SAQualityInterpreter : public ChoiceInterpreter<>
{ {
public: public:
SAQualityInterpreter () SAQualityInterpreter ()
@@ -528,7 +528,7 @@ public:
}; };
SAQualityInterpreter saQualityInterpreter; SAQualityInterpreter saQualityInterpreter;
class SAAntiBlurInterpreter : public ChoiceInterpreter class SAAntiBlurInterpreter : public ChoiceInterpreter<>
{ {
public: public:
SAAntiBlurInterpreter () SAAntiBlurInterpreter ()
@@ -1343,7 +1343,7 @@ public:
}; };
SALensID2Interpreter saLensID2Interpreter; SALensID2Interpreter saLensID2Interpreter;
class MATeleconverterInterpreter : public ChoiceInterpreter class MATeleconverterInterpreter : public ChoiceInterpreter<>
{ {
public: public:
MATeleconverterInterpreter () MATeleconverterInterpreter ()
@@ -1361,7 +1361,7 @@ public:
}; };
MATeleconverterInterpreter maTeleconverterInterpreter; MATeleconverterInterpreter maTeleconverterInterpreter;
class MAQualityInterpreter : public ChoiceInterpreter class MAQualityInterpreter : public ChoiceInterpreter<>
{ {
public: public:
MAQualityInterpreter () MAQualityInterpreter ()
@@ -1379,7 +1379,7 @@ public:
}; };
MAQualityInterpreter maQualityInterpreter; MAQualityInterpreter maQualityInterpreter;
class MAImageSizeInterpreter : public ChoiceInterpreter class MAImageSizeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
MAImageSizeInterpreter () MAImageSizeInterpreter ()
@@ -1394,7 +1394,7 @@ public:
}; };
MAImageSizeInterpreter maImageSizeInterpreter; MAImageSizeInterpreter maImageSizeInterpreter;
class SAQualityInterpreter2 : public ChoiceInterpreter class SAQualityInterpreter2 : public ChoiceInterpreter<>
{ {
public: public:
SAQualityInterpreter2 () SAQualityInterpreter2 ()
@@ -1410,7 +1410,7 @@ public:
}; };
SAQualityInterpreter2 saQualityInterpreter2; SAQualityInterpreter2 saQualityInterpreter2;
class SAQualityInterpreter3 : public ChoiceInterpreter class SAQualityInterpreter3 : public ChoiceInterpreter<>
{ {
public: public:
SAQualityInterpreter3 () SAQualityInterpreter3 ()
@@ -1423,7 +1423,7 @@ public:
}; };
SAQualityInterpreter3 saQualityInterpreter3; SAQualityInterpreter3 saQualityInterpreter3;
class SADriveMode : public ChoiceInterpreter class SADriveMode : public ChoiceInterpreter<>
{ {
public: public:
SADriveMode () SADriveMode ()
@@ -1445,7 +1445,7 @@ public:
}; };
SADriveMode saDriveMode; SADriveMode saDriveMode;
class SADriveMode2 : public ChoiceInterpreter class SADriveMode2 : public ChoiceInterpreter<>
{ {
public: public:
SADriveMode2 () SADriveMode2 ()
@@ -1461,7 +1461,7 @@ public:
}; };
SADriveMode2 saDriveMode2; SADriveMode2 saDriveMode2;
class SADriveMode3 : public ChoiceInterpreter class SADriveMode3 : public ChoiceInterpreter<>
{ {
public: public:
SADriveMode3 () SADriveMode3 ()
@@ -1487,7 +1487,7 @@ public:
}; };
SADriveMode3 saDriveMode3; SADriveMode3 saDriveMode3;
class SAFocusMode: public ChoiceInterpreter class SAFocusMode: public ChoiceInterpreter<>
{ {
public: public:
SAFocusMode () SAFocusMode ()
@@ -1502,7 +1502,7 @@ public:
}; };
SAFocusMode saFocusMode; SAFocusMode saFocusMode;
class SAFocusMode2: public ChoiceInterpreter class SAFocusMode2: public ChoiceInterpreter<>
{ {
public: public:
SAFocusMode2 () SAFocusMode2 ()
@@ -1516,7 +1516,7 @@ public:
}; };
SAFocusMode2 saFocusMode2; SAFocusMode2 saFocusMode2;
class SAFocusModeSetting3: public ChoiceInterpreter class SAFocusModeSetting3: public ChoiceInterpreter<>
{ {
public: public:
SAFocusModeSetting3 () SAFocusModeSetting3 ()
@@ -1531,7 +1531,7 @@ public:
}; };
SAFocusModeSetting3 saFocusModeSetting3; SAFocusModeSetting3 saFocusModeSetting3;
class SAAFMode: public ChoiceInterpreter class SAAFMode: public ChoiceInterpreter<>
{ {
public: public:
SAAFMode() SAAFMode()
@@ -1549,7 +1549,7 @@ public:
}; };
SAAFMode saAFMode; SAAFMode saAFMode;
class SAAFAreaMode: public ChoiceInterpreter class SAAFAreaMode: public ChoiceInterpreter<>
{ {
public: public:
SAAFAreaMode () SAAFAreaMode ()
@@ -1561,7 +1561,7 @@ public:
}; };
SAAFAreaMode saAFAreaMode; SAAFAreaMode saAFAreaMode;
class SAAFAreaMode2: public ChoiceInterpreter class SAAFAreaMode2: public ChoiceInterpreter<>
{ {
public: public:
SAAFAreaMode2 () SAAFAreaMode2 ()
@@ -1574,7 +1574,7 @@ public:
}; };
SAAFAreaMode2 saAFAreaMode2; SAAFAreaMode2 saAFAreaMode2;
class SAAFPointSelected: public ChoiceInterpreter class SAAFPointSelected: public ChoiceInterpreter<>
{ {
public: public:
SAAFPointSelected () SAAFPointSelected ()
@@ -1594,7 +1594,7 @@ public:
}; };
SAAFPointSelected saAFPointSelected; SAAFPointSelected saAFPointSelected;
class SACameraInfoAFPointSelected: public ChoiceInterpreter class SACameraInfoAFPointSelected: public ChoiceInterpreter<>
{ {
public: public:
SACameraInfoAFPointSelected () SACameraInfoAFPointSelected ()
@@ -1619,7 +1619,7 @@ public:
}; };
SACameraInfoAFPointSelected saCameraInfoAFPointSelected; SACameraInfoAFPointSelected saCameraInfoAFPointSelected;
class SACameraInfoAFPoint: public ChoiceInterpreter class SACameraInfoAFPoint: public ChoiceInterpreter<>
{ {
public: public:
SACameraInfoAFPoint () SACameraInfoAFPoint ()
@@ -1647,7 +1647,7 @@ public:
}; };
SACameraInfoAFPoint saCameraInfoAFPoint; SACameraInfoAFPoint saCameraInfoAFPoint;
class SAAFPointSelected2: public ChoiceInterpreter class SAAFPointSelected2: public ChoiceInterpreter<>
{ {
public: public:
SAAFPointSelected2 () SAAFPointSelected2 ()
@@ -1665,7 +1665,7 @@ public:
}; };
SAAFPointSelected2 saAFPointSelected2; SAAFPointSelected2 saAFPointSelected2;
class SAMeteringMode0_3: public ChoiceInterpreter class SAMeteringMode0_3: public ChoiceInterpreter<>
{ {
public: public:
SAMeteringMode0_3 () SAMeteringMode0_3 ()
@@ -1677,7 +1677,7 @@ public:
}; };
SAMeteringMode0_3 saMeteringMode0_3; SAMeteringMode0_3 saMeteringMode0_3;
class SAMeteringMode1_3: public ChoiceInterpreter class SAMeteringMode1_3: public ChoiceInterpreter<>
{ {
public: public:
SAMeteringMode1_3 () SAMeteringMode1_3 ()
@@ -1689,7 +1689,7 @@ public:
}; };
SAMeteringMode1_3 saMeteringMode1_3; SAMeteringMode1_3 saMeteringMode1_3;
class SAMeteringMode1_4: public ChoiceInterpreter class SAMeteringMode1_4: public ChoiceInterpreter<>
{ {
public: public:
SAMeteringMode1_4 () SAMeteringMode1_4 ()
@@ -1701,7 +1701,7 @@ public:
}; };
SAMeteringMode1_4 saMeteringMode1_4; SAMeteringMode1_4 saMeteringMode1_4;
class SADynamicRangeOptimizerMode: public ChoiceInterpreter class SADynamicRangeOptimizerMode: public ChoiceInterpreter<>
{ {
public: public:
SADynamicRangeOptimizerMode () SADynamicRangeOptimizerMode ()
@@ -1715,7 +1715,7 @@ public:
}; };
SADynamicRangeOptimizerMode saDynamicRangeOptimizerMode; SADynamicRangeOptimizerMode saDynamicRangeOptimizerMode;
class SADynamicRangeOptimizerSetting: public ChoiceInterpreter class SADynamicRangeOptimizerSetting: public ChoiceInterpreter<>
{ {
public: public:
SADynamicRangeOptimizerSetting () SADynamicRangeOptimizerSetting ()
@@ -1727,7 +1727,7 @@ public:
}; };
SADynamicRangeOptimizerSetting saDynamicRangeOptimizerSetting; SADynamicRangeOptimizerSetting saDynamicRangeOptimizerSetting;
class SACreativeStyle: public ChoiceInterpreter class SACreativeStyle: public ChoiceInterpreter<>
{ {
public: public:
SACreativeStyle () SACreativeStyle ()
@@ -1750,7 +1750,7 @@ public:
}; };
SACreativeStyle saCreativeStyle; SACreativeStyle saCreativeStyle;
class SACreativeStyle2: public ChoiceInterpreter class SACreativeStyle2: public ChoiceInterpreter<>
{ {
public: public:
SACreativeStyle2 () SACreativeStyle2 ()
@@ -1766,7 +1766,7 @@ public:
}; };
SACreativeStyle2 saCreativeStyle2; SACreativeStyle2 saCreativeStyle2;
class SACreativeStyleSetting: public ChoiceInterpreter class SACreativeStyleSetting: public ChoiceInterpreter<>
{ {
public: public:
SACreativeStyleSetting () SACreativeStyleSetting ()
@@ -1781,7 +1781,7 @@ public:
}; };
SACreativeStyleSetting saCreativeStyleSetting; SACreativeStyleSetting saCreativeStyleSetting;
class SAFlashControl: public ChoiceInterpreter class SAFlashControl: public ChoiceInterpreter<>
{ {
public: public:
SAFlashControl () SAFlashControl ()
@@ -1792,7 +1792,7 @@ public:
}; };
SAFlashControl saFlashControl; SAFlashControl saFlashControl;
class SAFlashMode: public ChoiceInterpreter class SAFlashMode: public ChoiceInterpreter<>
{ {
public: public:
SAFlashMode () SAFlashMode ()
@@ -1803,7 +1803,7 @@ public:
}; };
SAFlashMode saFlashMode; SAFlashMode saFlashMode;
class SAFlashMode2: public ChoiceInterpreter class SAFlashMode2: public ChoiceInterpreter<>
{ {
public: public:
SAFlashMode2 () SAFlashMode2 ()
@@ -1818,7 +1818,7 @@ public:
}; };
SAFlashMode2 saFlashMode2; SAFlashMode2 saFlashMode2;
class SAExposureProgram: public ChoiceInterpreter class SAExposureProgram: public ChoiceInterpreter<>
{ {
public: public:
SAExposureProgram () SAExposureProgram ()
@@ -1841,7 +1841,7 @@ public:
}; };
SAExposureProgram saExposureProgram; SAExposureProgram saExposureProgram;
class SAExposureProgram2: public ChoiceInterpreter class SAExposureProgram2: public ChoiceInterpreter<>
{ {
public: public:
SAExposureProgram2 () SAExposureProgram2 ()
@@ -1882,7 +1882,7 @@ public:
}; };
SAExposureProgram2 saExposureProgram2; SAExposureProgram2 saExposureProgram2;
class SARotation: public ChoiceInterpreter class SARotation: public ChoiceInterpreter<>
{ {
public: public:
SARotation () SARotation ()
@@ -1895,7 +1895,7 @@ public:
}; };
SARotation saRotation; SARotation saRotation;
class SASonyImageSize: public ChoiceInterpreter class SASonyImageSize: public ChoiceInterpreter<>
{ {
public: public:
SASonyImageSize () SASonyImageSize ()
@@ -1907,7 +1907,7 @@ public:
}; };
SASonyImageSize saSonyImageSize; SASonyImageSize saSonyImageSize;
class SASonyImageSize3: public ChoiceInterpreter class SASonyImageSize3: public ChoiceInterpreter<>
{ {
public: public:
SASonyImageSize3 () SASonyImageSize3 ()
@@ -1922,7 +1922,7 @@ public:
}; };
SASonyImageSize3 saSonyImageSize3; SASonyImageSize3 saSonyImageSize3;
class SAAspectRatio: public ChoiceInterpreter class SAAspectRatio: public ChoiceInterpreter<>
{ {
public: public:
SAAspectRatio () SAAspectRatio ()
@@ -1933,7 +1933,7 @@ public:
}; };
SAAspectRatio saAspectRatio; SAAspectRatio saAspectRatio;
class SAAspectRatio2: public ChoiceInterpreter class SAAspectRatio2: public ChoiceInterpreter<>
{ {
public: public:
SAAspectRatio2 () SAAspectRatio2 ()
@@ -1944,7 +1944,7 @@ public:
}; };
SAAspectRatio2 saAspectRatio2; SAAspectRatio2 saAspectRatio2;
class SAExposureLevelIncrements: public ChoiceInterpreter class SAExposureLevelIncrements: public ChoiceInterpreter<>
{ {
public: public:
SAExposureLevelIncrements () SAExposureLevelIncrements ()
@@ -1955,7 +1955,7 @@ public:
}; };
SAExposureLevelIncrements saExposureLevelIncrements; SAExposureLevelIncrements saExposureLevelIncrements;
class SAAFIlluminator: public ChoiceInterpreter class SAAFIlluminator: public ChoiceInterpreter<>
{ {
public: public:
SAAFIlluminator () SAAFIlluminator ()
@@ -1967,7 +1967,7 @@ public:
}; };
SAAFIlluminator saAFIlluminator; SAAFIlluminator saAFIlluminator;
class SAColorSpace1_2: public ChoiceInterpreter class SAColorSpace1_2: public ChoiceInterpreter<>
{ {
public: public:
SAColorSpace1_2 () SAColorSpace1_2 ()
@@ -1978,7 +1978,7 @@ public:
}; };
SAColorSpace1_2 saColorSpace1_2; SAColorSpace1_2 saColorSpace1_2;
class SAColorSpace0_5: public ChoiceInterpreter class SAColorSpace0_5: public ChoiceInterpreter<>
{ {
public: public:
SAColorSpace0_5 () SAColorSpace0_5 ()
@@ -1990,7 +1990,7 @@ public:
}; };
SAColorSpace0_5 saColorSpace0_5; SAColorSpace0_5 saColorSpace0_5;
class SAColorSpace5_6: public ChoiceInterpreter class SAColorSpace5_6: public ChoiceInterpreter<>
{ {
public: public:
SAColorSpace5_6 () SAColorSpace5_6 ()
@@ -2001,7 +2001,7 @@ public:
}; };
SAColorSpace5_6 saColorSpace5_6; SAColorSpace5_6 saColorSpace5_6;
class SAReleaseModeInterpreter: public ChoiceInterpreter class SAReleaseModeInterpreter: public ChoiceInterpreter<>
{ {
public: public:
SAReleaseModeInterpreter () SAReleaseModeInterpreter ()
@@ -2016,7 +2016,7 @@ public:
}; };
SAReleaseModeInterpreter saReleaseModeInterpreter; SAReleaseModeInterpreter saReleaseModeInterpreter;
class SAImageStyleInterpreter: public ChoiceInterpreter class SAImageStyleInterpreter: public ChoiceInterpreter<>
{ {
public: public:
SAImageStyleInterpreter () SAImageStyleInterpreter ()
@@ -2040,7 +2040,7 @@ public:
}; };
SAImageStyleInterpreter saImageStyleInterpreter; SAImageStyleInterpreter saImageStyleInterpreter;
class SAPictureEffectInterpreter: public ChoiceInterpreter class SAPictureEffectInterpreter: public ChoiceInterpreter<>
{ {
public: public:
SAPictureEffectInterpreter() SAPictureEffectInterpreter()
@@ -2085,7 +2085,7 @@ public:
}; };
SAPictureEffectInterpreter saPictureEffectInterpreter; SAPictureEffectInterpreter saPictureEffectInterpreter;
class SACameraInfoFocusStatusInterpreter : public ChoiceInterpreter class SACameraInfoFocusStatusInterpreter : public ChoiceInterpreter<>
{ {
public: public:
SACameraInfoFocusStatusInterpreter() SACameraInfoFocusStatusInterpreter()

42
rtexif/stdattribs.cc
View File

@@ -28,7 +28,7 @@
namespace rtexif namespace rtexif
{ {
class ColorSpaceInterpreter : public ChoiceInterpreter class ColorSpaceInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -41,7 +41,7 @@ public:
}; };
ColorSpaceInterpreter colorSpaceInterpreter; ColorSpaceInterpreter colorSpaceInterpreter;
class PreviewColorSpaceInterpreter : public ChoiceInterpreter class PreviewColorSpaceInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -56,7 +56,7 @@ public:
}; };
PreviewColorSpaceInterpreter previewColorSpaceInterpreter; PreviewColorSpaceInterpreter previewColorSpaceInterpreter;
class LinearSRGBInterpreter : public ChoiceInterpreter class LinearSRGBInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -68,7 +68,7 @@ public:
}; };
LinearSRGBInterpreter linearSRGBInterpreter; LinearSRGBInterpreter linearSRGBInterpreter;
class DefaultBlackRenderInterpreter : public ChoiceInterpreter class DefaultBlackRenderInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -80,7 +80,7 @@ public:
}; };
DefaultBlackRenderInterpreter defaultBlackRenderInterpreter; DefaultBlackRenderInterpreter defaultBlackRenderInterpreter;
class ExposureProgramInterpreter : public ChoiceInterpreter class ExposureProgramInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -99,7 +99,7 @@ public:
}; };
ExposureProgramInterpreter exposureProgramInterpreter; ExposureProgramInterpreter exposureProgramInterpreter;
class MeteringModeInterpreter : public ChoiceInterpreter class MeteringModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -117,7 +117,7 @@ public:
}; };
MeteringModeInterpreter meteringModeInterpreter; MeteringModeInterpreter meteringModeInterpreter;
class ExposureModeInterpreter : public ChoiceInterpreter class ExposureModeInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -130,7 +130,7 @@ public:
}; };
ExposureModeInterpreter exposureModeInterpreter; ExposureModeInterpreter exposureModeInterpreter;
class WhiteBalanceInterpreter : public ChoiceInterpreter class WhiteBalanceInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -142,7 +142,7 @@ public:
}; };
WhiteBalanceInterpreter whiteBalanceInterpreter; WhiteBalanceInterpreter whiteBalanceInterpreter;
class SceneCaptureInterpreter : public ChoiceInterpreter class SceneCaptureInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -156,7 +156,7 @@ public:
}; };
SceneCaptureInterpreter sceneCaptureInterpreter; SceneCaptureInterpreter sceneCaptureInterpreter;
class GainControlInterpreter : public ChoiceInterpreter class GainControlInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -171,7 +171,7 @@ public:
}; };
GainControlInterpreter gainControlInterpreter; GainControlInterpreter gainControlInterpreter;
class ContrastInterpreter : public ChoiceInterpreter class ContrastInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -184,7 +184,7 @@ public:
}; };
ContrastInterpreter contrastInterpreter; ContrastInterpreter contrastInterpreter;
class SharpnessInterpreter : public ChoiceInterpreter class SharpnessInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -197,7 +197,7 @@ public:
}; };
SharpnessInterpreter sharpnessInterpreter; SharpnessInterpreter sharpnessInterpreter;
class SaturationInterpreter : public ChoiceInterpreter class SaturationInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -210,7 +210,7 @@ public:
}; };
SaturationInterpreter saturationInterpreter; SaturationInterpreter saturationInterpreter;
class FlashInterpreter : public ChoiceInterpreter class FlashInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -242,7 +242,7 @@ public:
}; };
FlashInterpreter flashInterpreter; FlashInterpreter flashInterpreter;
class LightSourceInterpreter : public ChoiceInterpreter class LightSourceInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -273,7 +273,7 @@ public:
}; };
LightSourceInterpreter lightSourceInterpreter; LightSourceInterpreter lightSourceInterpreter;
class CompressionInterpreter : public ChoiceInterpreter class CompressionInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -285,7 +285,7 @@ public:
}; };
CompressionInterpreter compressionInterpreter; CompressionInterpreter compressionInterpreter;
class PhotometricInterpreter : public ChoiceInterpreter class PhotometricInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -297,7 +297,7 @@ public:
}; };
PhotometricInterpreter photometricInterpreter; PhotometricInterpreter photometricInterpreter;
class ProfileEmbedPolicyInterpreter : public ChoiceInterpreter class ProfileEmbedPolicyInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -311,7 +311,7 @@ public:
}; };
ProfileEmbedPolicyInterpreter profileEmbedPolicyInterpreter; ProfileEmbedPolicyInterpreter profileEmbedPolicyInterpreter;
class PlanarConfigInterpreter : public ChoiceInterpreter class PlanarConfigInterpreter : public ChoiceInterpreter<>
{ {
public: public:
@@ -591,7 +591,7 @@ public:
}; };
CFAInterpreter cfaInterpreter; CFAInterpreter cfaInterpreter;
class OrientationInterpreter : public ChoiceInterpreter class OrientationInterpreter : public ChoiceInterpreter<>
{ {
public: public:
OrientationInterpreter () OrientationInterpreter ()
@@ -610,7 +610,7 @@ public:
}; };
OrientationInterpreter orientationInterpreter; OrientationInterpreter orientationInterpreter;
class UnitsInterpreter : public ChoiceInterpreter class UnitsInterpreter : public ChoiceInterpreter<>
{ {
public: public:
UnitsInterpreter() UnitsInterpreter()

2
rtgui/batchqueue.h
View File

@@ -99,6 +99,8 @@ private:
bool saveBatchQueue (); bool saveBatchQueue ();
void notifyListener (); void notifyListener ();
using ThumbBrowserBase::redrawNeeded;
BatchQueueEntry* processing; // holds the currently processed image BatchQueueEntry* processing; // holds the currently processed image
FileCatalog* fileCatalog; FileCatalog* fileCatalog;
int sequence; // holds the current sequence index int sequence; // holds the current sequence index

2
rtgui/filebrowser.h
View File

@@ -61,6 +61,8 @@ class FileBrowser : public ThumbBrowserBase,
private: private:
typedef sigc::signal<void> type_trash_changed; typedef sigc::signal<void> type_trash_changed;
using ThumbBrowserBase::redrawNeeded;
IdleRegister idle_register; IdleRegister idle_register;
unsigned int session_id_; unsigned int session_id_;

2
rtgui/guiutils.h
View File

@@ -194,6 +194,8 @@ private:
ExpanderBox* expBox; /// Frame that includes the child and control its visibility ExpanderBox* expBox; /// Frame that includes the child and control its visibility
Gtk::EventBox *imageEvBox; /// Enable/Disable or Open/Close arrow event box Gtk::EventBox *imageEvBox; /// Enable/Disable or Open/Close arrow event box
using Gtk::Container::add;
/// Triggered on opened/closed event /// Triggered on opened/closed event
bool on_toggle(GdkEventButton* event); bool on_toggle(GdkEventButton* event);
/// Triggered on enabled/disabled change -> will emit a toggle event to the connected objects /// Triggered on enabled/disabled change -> will emit a toggle event to the connected objects