Merge branch 'dev' into preprocess_wb

2020-05-13 19:47:09 +02:00
parent fb023e7ba8 5db57952ed
commit 6590e6d98b
81 changed files with 4427 additions and 1344 deletions
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -299,6 +299,7 @@ public:

    // FilmNegProvider interface
    bool getFilmNegativeExponents(rtengine::Coord spotA, rtengine::Coord spotB, std::array<float, 3>& newExps) override;
+    bool getRawSpotValues(rtengine::Coord spot, int spotSize, std::array<float, 3>& rawValues) override;

    // rotatelistener interface
    void straightenRequested () override;