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/ipgrain.cc
+++ b/rtengine/ipgrain.cc
@@ -39,10 +39,7 @@
    along with darktable.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef _OPENMP
-#include <omp.h>
-#endif
-
+#include "imagefloat.h"
 #include "improcfun.h"
 #include "rt_math.h"