Merge branch 'master' into hilite_recon

rtengine/dcraw.cc

@@ -136,10 +136,10 @@ const float d65_white[3] = { 0.950456, 1, 1.088754 };
 
 #define SQR(x) rtengine::SQR(x)
 #define ABS(x) (((int)(x) ^ ((int)(x) >> 31)) - ((int)(x) >> 31))
-#define MIN(a,b) rtengine::min(a,static_cast<typeof(a)>(b))
-#define MAX(a,b) rtengine::max(a,static_cast<typeof(a)>(b))
-#define LIM(x,min,max) rtengine::LIM(x,static_cast<typeof(x)>(min),static_cast<typeof(x)>(max))
-#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<typeof(x)>(y),static_cast<typeof(x)>(z))
+#define MIN(a,b) rtengine::min(a,static_cast<__typeof__(a)>(b))
+#define MAX(a,b) rtengine::max(a,static_cast<__typeof__(a)>(b))
+#define LIM(x,min,max) rtengine::LIM(x,static_cast<__typeof__(x)>(min),static_cast<__typeof__(x)>(max))
+#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<__typeof__(x)>(y),static_cast<__typeof__(x)>(z))
 #define CLIP(x) rtengine::CLIP(x)
 #define SWAP(a,b) { a=a+b; b=a-b; a=a-b; }
 

rtengine/dcraw.patch

@@ -1,5 +1,5 @@
---- dcraw.c	2015-08-15 15:35:27 +0000
-+++ dcraw.cc	2015-08-16 13:46:33 +0000
+--- dcraw.c	2015-09-21 10:08:04 +0000
++++ dcraw.cc	2015-10-14 14:29:55 +0000
 @@ -1,3 +1,15 @@
 +/*RT*/#include <glib.h>
 +/*RT*/#include <glib/gstdio.h>
@@ -148,10 +148,10 @@
 -#define LIM(x,min,max) MAX(min,MIN(x,max))
 -#define ULIM(x,y,z) ((y) < (z) ? LIM(x,y,z) : LIM(x,z,y))
 -#define CLIP(x) LIM(x,0,65535)
-+#define MIN(a,b) rtengine::min(a,static_cast<typeof(a)>(b))
-+#define MAX(a,b) rtengine::max(a,static_cast<typeof(a)>(b))
-+#define LIM(x,min,max) rtengine::LIM(x,static_cast<typeof(x)>(min),static_cast<typeof(x)>(max))
-+#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<typeof(x)>(y),static_cast<typeof(x)>(z))
++#define MIN(a,b) rtengine::min(a,static_cast<__typeof__(a)>(b))
++#define MAX(a,b) rtengine::max(a,static_cast<__typeof__(a)>(b))
++#define LIM(x,min,max) rtengine::LIM(x,static_cast<__typeof__(x)>(min),static_cast<__typeof__(x)>(max))
++#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<__typeof__(x)>(y),static_cast<__typeof__(x)>(z))
 +#define CLIP(x) rtengine::CLIP(x)
  #define SWAP(a,b) { a=a+b; b=a-b; a=a-b; }
  

rtengine/improccoordinator.cc

@@ -220,13 +220,11 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
         }
 
         imgsrc->demosaic( rp );
+        // if a demosaic happened we should also call getimage later, so we need to set the M_INIT flag
+        todo |= M_INIT;
 
         if (highDetailNeeded) {
             highDetailRawComputed = true;
-
-            if (params.toneCurve.hrenabled && params.toneCurve.method == "Color") {
-                todo |= M_INIT;
-            }
         } else {
             highDetailRawComputed = false;
         }

rtgui/adjuster.cc

@@ -17,7 +17,7 @@
  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "adjuster.h"
-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
 #include <cmath>
 #include "multilangmgr.h"
 #include "../rtengine/rtengine.h"

rtgui/preferences.cc

@@ -16,7 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
 #include "preferences.h"
 #include "multilangmgr.h"
 #include "splash.h"

rtgui/thresholdadjuster.cc

@@ -17,7 +17,7 @@
  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "thresholdadjuster.h"
-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
 #include <cmath>
 #include "multilangmgr.h"
 #include "../rtengine/rtengine.h"

rtgui/tonecurve.cc

@@ -18,7 +18,7 @@
  */
 #include "tonecurve.h"
 #include "adjuster.h"
-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
 #include <iomanip>
 #include "ppversion.h"
 #include "edit.h"