merge with dev

rtgui/toolpanelcoord.h

@@ -83,6 +83,7 @@
 #include "softlight.h"
 #include "dehaze.h"
 #include "guiutils.h"
+#include "filmnegative.h"
 
 class ImageEditorCoordinator;
 
@@ -98,7 +99,8 @@ class ToolPanelCoordinator :
     public CropPanelListener,
     public ICMPanelListener,
     public ImageAreaToolListener,
-    public rtengine::ImageTypeListener
+    public rtengine::ImageTypeListener,
+    public FilmNegProvider
 {
 protected:
     WhiteBalance* whitebalance;
@@ -154,6 +156,7 @@ protected:
     XTransRAWExposure* xtransrawexposure;
     FattalToneMapping *fattal;
     MetaDataPanel* metadata;
+    FilmNegative* filmNegative;
 
     std::vector<PParamsChangeListener*> paramcListeners;
 
@@ -297,6 +300,9 @@ public:
     rtengine::RawImage* getFF() override;
     Glib::ustring GetCurrentImageFilePath() override;
 
+    // FilmNegProvider interface
+    bool getFilmNegativeExponents(rtengine::Coord spotA, rtengine::Coord spotB, std::array<float, 3>& newExps) override;
+
     // rotatelistener interface
     void straightenRequested () override;
     void autoCropRequested () override;