merge with dev

2020-04-18 07:43:44 +02:00
parent 10ed56e740 22eee9787e
commit f0e78b2a0d
22 changed files with 708 additions and 190 deletions
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -306,6 +306,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;