merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-11-03 17:24:34 +01:00
52 changed files with 324 additions and 339 deletions

View File

@@ -1142,7 +1142,7 @@ template<class T> void gaussVerticalmult (T** src, T** dst, const int W, const i
template<class T> void gaussianBlurImpl(T** src, T** dst, const int W, const int H, const double sigma, T *buffer = nullptr, eGaussType gausstype = GAUSS_STANDARD, T** buffer2 = nullptr)
{
static constexpr auto GAUSS_3X3_LIMIT = 0.6;
static constexpr auto GAUSS_DOUBLE = 70.0;
static constexpr auto GAUSS_DOUBLE = 25.0;
if(buffer) {
// special variant for very large sigma, currently only used by retinex algorithm