merge with dev

2019-11-20 12:57:44 +01:00
parent 6ebc03b638 c21d142098
commit 1f329bded2
12 changed files with 3528 additions and 17 deletions
--- a/rtengine/guidedfilter.h
+++ b/rtengine/guidedfilter.h
@@ -20,11 +20,12 @@

 #pragma once

-#include "array2D.h"
+template<typename T> class array2D;

 namespace rtengine
 {

+
 void guidedFilter(const array2D<float> &guide, const array2D<float> &src, array2D<float> &dst, int r, float epsilon, bool multithread, int subsampling=0);

 void guidedFilterLog(float base, array2D<float> &chan, int r, float eps, bool multithread, int subsampling=0);