more double promote fixes, still not complete

rtengine/CMakeLists.txt

@@ -105,6 +105,7 @@ set(RTENGINESOURCEFILES
     lj92.c
     lmmse_demosaic.cc
     loadinitial.cc
+    munselllch.cc
     myfile.cc
     panasonic_decoders.cc
     pdaflinesfilter.cc

rtengine/color.h

@@ -20,16 +20,16 @@
 #pragma once
 
 #include <array>
-#include <glibmm/ustring.h>
 
 #include "rt_math.h"
 #include "LUT.h"
-#include "iccmatrices.h"
 #include "lcms2.h"
 #include "sleef.h"
 
-#define SAT(a,b,c) ((float)max(a,b,c)-(float)min(a,b,c))/(float)max(a,b,c)
-
+namespace Glib
+{
+class ustring;
+}
 namespace rtengine
 {
 

rtengine/curves.cc

@@ -33,6 +33,7 @@
 #include "opthelper.h"
 #include "ciecam02.h"
 #include "color.h"
+#include "iccmatrices.h"
 #include "iccstore.h"
 
 using namespace std;

rtengine/rawimagesource.cc

@@ -25,6 +25,7 @@
 #include "dcp.h"
 #include "dfmanager.h"
 #include "ffmanager.h"
+#include "iccmatrices.h"
 #include "iccstore.h"
 #include "imagefloat.h"
 #include "improcfun.h"

rtengine/rtthumbnail.cc

@@ -31,6 +31,7 @@
 #include "colortemp.h"
 #include "curves.h"
 #include "dcp.h"
+#include "iccmatrices.h"
 #include "iccstore.h"
 #include "image8.h"
 #include "improcfun.h"