Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2c32791a · Alexander Alekhin · c8ed08d0 · f26c9836 · 2c32791a
Commit 2c32791a authored Apr 05, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

disparity_filters.cpp modules/ximgproc/src/disparity_filters.cpp +2 -0

No files found.
--- a/modules/ximgproc/src/disparity_filters.cpp
+++ b/modules/ximgproc/src/disparity_filters.cpp
@@ -244,6 +244,8 @@ void DisparityWLSFilterImpl::filter(InputArray disparity_map_left, InputArray le
    filter_(left, left_view, filt_disp, right, ROI);
    if (disparity_map_left.depth() != CV_32F){
        filt_disp.convertTo(filtered_disparity_map, disparity_map_left.depth());
+    } else {
+        filt_disp.copyTo(filtered_disparity_map);
    }
 }