Merge pull request #2482 from ilya-lavrenov:tapi_fix

11 years ago · c72a0a1295
parent 6b434befc9 6be7869ae8
commit c72a0a1295
1 changed files with 1 additions and 2 deletions
--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@ -4355,9 +4355,8 @@ int predictOptimalVectorWidth(InputArray src1, InputArray src2, InputArray src3,
        d.preferredVectorWidthShort(), d.preferredVectorWidthShort(),
        d.preferredVectorWidthInt(), d.preferredVectorWidthFloat(),
        d.preferredVectorWidthDouble(), -1 }, width = vectorWidths[depth];
-    CV_Assert(width >= 0);

-    if (ssize.width * cn < width)
+    if (ssize.width * cn < width || width <= 0)
        return 1;

    std::vector<size_t> offsets, steps, cols;