Merge branch 'dev' into newlocallab

2018-07-19 23:07:59 +02:00
parent e65c6786ff d73e5428f9
commit 0780aa0f8f
2038 changed files with 40844 additions and 190177 deletions
--- a/rtengine/rawimage.h
+++ b/rtengine/rawimage.h
@@ -170,10 +170,22 @@ public:
    {
        return top_margin;
    }
+
+    int get_rawwidth() const
+    {
+        return raw_width;
+    }
+
    int get_FujiWidth() const
    {
        return fuji_width;
    }
+
+    float const * get_FloatRawImage() const
+    {
+        return float_raw_image;
+    }
+
    eSensorType getSensorType();

    void getRgbCam(float rgbcam[3][4]);
@@ -315,6 +327,11 @@ public:
        return filters == 9;
    }

+    bool isFloat() const
+    {
+        return float_raw_image;
+    }
+
 public:
    // dcraw functions
    void pre_interpolate()