merge with dev

2018-03-20 18:21:51 +01:00
parent 0bf7736f61 33a24bb1d3
commit a08c7b4182
34 changed files with 1509 additions and 2218 deletions
--- a/rtengine/rawimagesource.h
+++ b/rtengine/rawimagesource.h
@@ -145,6 +145,10 @@ public:
    {
        return ri != nullptr ? ri->getSensorType() : ST_NONE;
    }
+    bool        isMono () const
+    {
+        return ri->get_colors() == 1;
+    }
    ColorTemp   getWB() const
    {
        return camera_wb;