Merge pull request #2557 from ilya-lavrenov:tapi_fnlm_fix

2aab7b29 · Andrey Pavlenko · OpenCV Buildbot · c165f073 · 2cd51c04 · 2aab7b29
Commit 2aab7b29 authored Apr 02, 2014 by Andrey Pavlenko Committed by OpenCV Buildbot Apr 02, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

fast_nlmeans_denoising_opencl.hpp modules/photo/src/fast_nlmeans_denoising_opencl.hpp +1 -1

No files found.
--- a/modules/photo/src/fast_nlmeans_denoising_opencl.hpp
+++ b/modules/photo/src/fast_nlmeans_denoising_opencl.hpp
@@ -72,7 +72,7 @@ static bool ocl_fastNlMeansDenoising(InputArray _src, OutputArray _dst, float h,
    int type = _src.type(), cn = CV_MAT_CN(type);
    Size size = _src.size();

-    if ( type != CV_8UC1 || type != CV_8UC2 || type != CV_8UC4 )
+    if ( type != CV_8UC1 && type != CV_8UC2 && type != CV_8UC4 )
        return false;

    int templateWindowHalfWize = templateWindowSize / 2;