Merge pull request #1709 from LaurentBerger/BM3D_STEPALL

* Process InputOutputArray when BM3D_STEPALL is set

* Step1 created if needed- noArray in test
pull/1713/head^2
LaurentBerger 7 years ago committed by Alexander Alekhin
parent e38c55057a
commit a83b78e29a
  1. 2
      modules/xphoto/src/bm3d_image_denoising.cpp
  2. 2
      modules/xphoto/test/test_denoise_bm3d.cpp

@ -148,6 +148,8 @@ void bm3dDenoising(
_dst.create(srcSize, type);
break;
case BM3D_STEPALL:
if (_basic.needed())
_basic.create(srcSize, type);
_dst.create(srcSize, type);
break;
default:

@ -76,7 +76,7 @@ namespace opencv_test { namespace {
// BM3D: two different calls doing exactly the same thing
cv::Mat result, resultSec;
cv::xphoto::bm3dDenoising(original, cv::Mat(), resultSec, 10, 4, 16, 2500, 400, 8, 1, 0.0f, cv::NORM_L2, cv::xphoto::BM3D_STEPALL);
cv::xphoto::bm3dDenoising(original, noArray(), resultSec, 10, 4, 16, 2500, 400, 8, 1, 0.0f, cv::NORM_L2, cv::xphoto::BM3D_STEPALL);
cv::xphoto::bm3dDenoising(original, result, 10, 4, 16, 2500, 400, 8, 1, 0.0f, cv::NORM_L2, cv::xphoto::BM3D_STEPALL);
DUMP(result, expected_path + ".res.png");

Loading…
Cancel
Save