Merge branch 'dev' into spot-removal-tool (#2239)

This commit is contained in:
Hombre
2018-01-25 20:41:10 +01:00
183 changed files with 9182 additions and 5571 deletions

View File

@@ -26,7 +26,7 @@ namespace rtengine
// Aligned so the first entry starts on line 30
enum ProcEvent {
enum ProcEventCode {
EvPhotoLoaded = 0,
EvProfileLoaded = 1,
EvProfileChanged = 2,
@@ -511,18 +511,41 @@ enum ProcEvent {
EvCATgreensc = 481,
EvCATybscen = 482,
EvCATAutoyb = 483,
// profiled lens correction new events
EvLensCorrMode = 484,
EvLensCorrLensfunCamera = 485,
EvLensCorrLensfunLens = 486,
// Fattal tone mapping
EvTMFattalEnabled = 487,
EvTMFattalThreshold = 488,
EvTMFattalAmount = 489,
EvWBEnabled = 490,
EvRGBEnabled = 491,
EvLEnabled = 492,
EvPixelShiftOneGreen = 493,
NUMOFEVENTS
};
class ProcEvent {
public:
ProcEvent(): code_(0) {}
ProcEvent(ProcEventCode code): code_(code) {}
explicit ProcEvent(int code): code_(code) {}
operator int() { return code_; }
private:
int code_;
};
inline bool operator==(ProcEvent a, ProcEvent b) { return int(a) == int(b); }
inline bool operator==(ProcEvent a, ProcEventCode b) { return int(a) == int(b); }
inline bool operator==(ProcEventCode a, ProcEvent b) { return int(a) == int(b); }
inline bool operator!=(ProcEvent a, ProcEvent b) { return int(a) != int(b); }
inline bool operator!=(ProcEvent a, ProcEventCode b) { return int(a) != int(b); }
inline bool operator!=(ProcEventCode a, ProcEvent b) { return int(a) != int(b); }
}
#endif