Merge branch 'dev' into newlocallab

2019-11-04 23:01:33 +01:00
parent 91b80b23d2 ec5eaf9cea
commit 033d9fe02a
395 changed files with 2523 additions and 2740 deletions
--- a/rtengine/color.h
+++ b/rtengine/color.h
@@ -20,14 +20,13 @@
 #pragma once

 #include <array>
-#include <glibmm.h>
+#include <glibmm/ustring.h>

 #include "rt_math.h"
 #include "LUT.h"
-#include "labimage.h"
 #include "iccmatrices.h"
 #include "lcms2.h"
-#include "sleef.c"
+#include "sleef.h"

 #define SAT(a,b,c) ((float)max(a,b,c)-(float)min(a,b,c))/(float)max(a,b,c)