Merge branch 'master' into softproofing

2016-10-04 00:04:57 +02:00
parent ee4749f271 1c9b84aadb
commit 23011fbd63
71 changed files with 1083 additions and 822 deletions
--- a/rtengine/settings.h
+++ b/rtengine/settings.h
@@ -72,7 +72,7 @@ public:
    int             nrwavlevel;
    bool            daubech;
    bool            ciebadpixgauss;
-    int             CRI_color; // N<EFBFBD> for display Lab value  ; 0 disabled
+    int             CRI_color; // Number for display Lab value; 0 = disabled
    int             denoiselabgamma; // 0=gamma 26 11   1=gamma 40 5  2 =gamma 55 10
    //  double          colortoningab; //
    //  double          decaction;