Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix

Browse Source
pull/2096/merge
Andrey Pavlenko 11 years ago committed by OpenCV Buildbot
parent 967703c3ac a2e683d133
commit 2d5723ccca
1 changed files with 3 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      modules/core/src/convert.cpp

9
modules/core/src/convert.cpp
Unescape View File

@ -692,7 +692,7 @@ static bool ocl_mixChannels(InputArrayOfArrays _src, InputOutputArrayOfArrays _d
for (size_t i = 0; i < npairs; ++i) for (size_t i = 0; i < npairs; ++i)
argindex = k.set(argindex, ocl::KernelArg::ReadOnlyNoSize(srcargs[i])); argindex = k.set(argindex, ocl::KernelArg::ReadOnlyNoSize(srcargs[i]));
for (size_t i = 0; i < npairs; ++i) for (size_t i = 0; i < npairs; ++i)
argindex = k.set(argindex, ocl::KernelArg::ReadOnlyNoSize(dstargs[i])); argindex = k.set(argindex, ocl::KernelArg::WriteOnlyNoSize(dstargs[i]));
k.set(k.set(argindex, size.height), size.width); k.set(k.set(argindex, size.height), size.width);
size_t globalsize[2] = { size.width, size.height }; size_t globalsize[2] = { size.width, size.height };
@ -737,12 +737,9 @@ void cv::mixChannels(InputArrayOfArrays src, InputOutputArrayOfArrays dst,
if (fromTo.empty()) if (fromTo.empty())
return; return;
if (ocl::useOpenCL() && src.isUMatVector() && dst.isUMatVector() /*&& if (ocl::useOpenCL() && src.isUMatVector() && dst.isUMatVector() &&
ocl_mixChannels(src, dst, &fromTo[0], fromTo.size()>>1)*/) ocl_mixChannels(src, dst, &fromTo[0], fromTo.size()>>1))
{
CV_Assert(ocl_mixChannels(src, dst, &fromTo[0], fromTo.size()>>1));
return; return;
}
bool src_is_mat = src.kind() != _InputArray::STD_VECTOR_MAT && bool src_is_mat = src.kind() != _InputArray::STD_VECTOR_MAT &&
src.kind() != _InputArray::STD_VECTOR_VECTOR && src.kind() != _InputArray::STD_VECTOR_VECTOR &&

Write Preview
Loading…
Cancel
Save