Merge branch 'dev' into multiframe-handling, with some merge bugfix

2017-09-17 01:15:51 +02:00
parent ee0bff4124 10a4c5f1de
commit 0905294bda
197 changed files with 11535 additions and 5495 deletions
--- a/rtengine/rawimagesource.h
+++ b/rtengine/rawimagesource.h
@@ -233,6 +233,7 @@ protected:

    void cfa_linedn (float linenoiselevel);//Emil's line denoise

+    void green_equilibrate_global (array2D<float> &rawData);
    void green_equilibrate (float greenthresh, array2D<float> &rawData);//Emil's green equilibration

    void nodemosaic(bool bw);