From: Andrey Pavlenko Date: Thu, 13 Mar 2014 12:48:38 +0000 (+0400) Subject: Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~558 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b6cfa893d43bc24fb15b690b9400aad71ddf298;p=profile%2Fivi%2Fopencv.git Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans --- 6b6cfa893d43bc24fb15b690b9400aad71ddf298 diff --cc modules/photo/src/denoising.cpp index a553204,c9670f4..98bb4fc --- a/modules/photo/src/denoising.cpp +++ b/modules/photo/src/denoising.cpp @@@ -133,14 -142,14 +142,14 @@@ static void fastNlMeansDenoisingMultiCh { CV_Error(Error::StsBadArg, "imgToDenoiseIndex and temporalWindowSize " - "should be choosen corresponding srcImgs size!"); + "should be chosen corresponding srcImgs size!"); } - for (int i = 1; i < src_imgs_size; i++) { - if (srcImgs[0].size() != srcImgs[i].size() || srcImgs[0].type() != srcImgs[i].type()) { + for (int i = 1; i < src_imgs_size; i++) + if (srcImgs[0].size() != srcImgs[i].size() || srcImgs[0].type() != srcImgs[i].type()) + { CV_Error(Error::StsBadArg, "Input images should have the same size and type!"); } - } } void cv::fastNlMeansDenoisingMulti( InputArrayOfArrays _srcImgs, OutputArray _dst,