Merge branch 'dev' into newlocallab

This commit is contained in:
Ingo Weyrich
2020-02-07 18:24:50 +01:00
83 changed files with 1676 additions and 1767 deletions

View File

@@ -20,7 +20,6 @@
#pragma once
#include <array>
#include <glibmm/ustring.h>
#include "rt_math.h"
#include "LUT.h"
@@ -30,6 +29,13 @@
#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
{