merge with dev

2019-07-18 13:41:26 +02:00
parent 1add88a9ae 4a6956d91e
commit cbeb828609
52 changed files with 1853 additions and 463 deletions
--- a/rtengine/rawimage.h
+++ b/rtengine/rawimage.h
@@ -114,7 +114,7 @@ public:
        return float_raw_image;
    }

-    eSensorType getSensorType();
+    eSensorType getSensorType() const;

    void getRgbCam(float rgbcam[3][4]);
    void getXtransMatrix(int xtransMatrix[6][6]);