merge with dev and fixed some bugs

2019-10-27 17:09:53 +01:00
parent 82439e9a77 f3adbd9fd7
commit 94e3ce3e07
19 changed files with 1088 additions and 1607 deletions
--- a/rtengine/dirpyr_equalizer.cc
+++ b/rtengine/dirpyr_equalizer.cc
@@ -274,7 +274,8 @@ void idirpyr_eq_channel_loc(float ** data_coarse, float ** data_fine, float ** b
 #ifdef _OPENMP
            #pragma omp parallel if (multiThread)
 #endif            
-            rtengine::boxblur<float, float>(buffer, buffer, blurbufcbdl.data, rad, rad, width, height);
+//            rtengine::boxblur<float, float>(buffer, buffer, blurbufcbdl.data, rad, rad, width, height);
+            rtengine::boxblur(buffer, buffer, rad, width, height, false);
            blurbufcbdl.resize(0); 
        }