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

merge with Dev

Browse Source
This commit is contained in:
Desmis
2019-02-17 14:50:41 +01:00
parent 03315b496a c85dc2811b
commit 5e66e402fa
15 changed files with 241 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/demosaic_algos.cc
View File

@@ -388,7 +388,7 @@ void RawImageSource::jdl_interpolate_omp() // from "Lassus"
}
#ifdef _OPENMP
#pragma omp parallel default(none) shared(image,width,height,u,w,v,y,x,z,dif,chr) private(row,col,f,g,indx,c,d,i)
#pragma omp parallel shared(image,width,height,u,w,v,y,x,z,dif,chr) private(row,col,f,g,indx,c,d,i)
#endif
{
#ifdef _OPENMP
@@ -1159,7 +1159,7 @@ void RawImageSource::igv_interpolate(int winw, int winh)
}
#ifdef _OPENMP
#pragma omp parallel default(none) shared(rgb,vdif,hdif,chr)
#pragma omp parallel shared(rgb,vdif,hdif,chr)
#endif
{
__m128 ngv, egv, wgv, sgv, nvv, evv, wvv, svv, nwgv, negv, swgv, segv, nwvv, nevv, swvv, sevv, tempv, temp1v, temp2v, temp3v, temp4v, temp5v, temp6v, temp7v, temp8v;
@@ -1548,7 +1548,7 @@ void RawImageSource::igv_interpolate(int winw, int winh)
}
#ifdef _OPENMP
#pragma omp parallel default(none) shared(rgb,vdif,hdif,chr)
#pragma omp parallel shared(rgb,vdif,hdif,chr)
#endif
{

4
rtengine/ipretinex.cc
View File

@@ -394,7 +394,7 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e
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];;
@@ -898,7 +898,7 @@ void ImProcFunctions::MSRLocal(int sp, float** luminance, float** templ, const f
pond /= log(elogt);
}
auto shmap = mapmet == 4 ? new SHMap(W_L, H_L, true) : nullptr;
auto shmap = mapmet == 4 ? new SHMap(W_L, H_L) : nullptr;
float *buffer = new float[W_L * H_L];

2
rtengine/shmap.cc
View File

@@ -30,7 +30,7 @@ namespace rtengine
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];

3
rtengine/shmap.h
View File

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

80
rtexif/canonattribs.cc
View File

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

28
rtexif/fujiattribs.cc
View File

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

4
rtexif/nikonattribs.cc
View File

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

26
rtexif/olympusattribs.cc
View File

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

92
rtexif/pentaxattribs.cc
View File

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

27
rtexif/rtexif.h
View File

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

152
rtexif/sonyminoltaattribs.cc
View File

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

42
rtexif/stdattribs.cc
View File

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

2
rtgui/batchqueue.h
View File

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

2
rtgui/filebrowser.h
View File

@@ -61,6 +61,8 @@ class FileBrowser : public ThumbBrowserBase,
private:
typedef sigc::signal<void> type_trash_changed;
using ThumbBrowserBase::redrawNeeded;
IdleRegister idle_register;
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
Gtk::EventBox *imageEvBox; /// Enable/Disable or Open/Close arrow event box
using Gtk::Container::add;
/// Triggered on opened/closed event
bool on_toggle(GdkEventButton* event);
/// Triggered on enabled/disabled change -> will emit a toggle event to the connected objects