Skip to content

O
opencv
Commit 73c96cbd authored by Ilya Lavrenov's avatar Ilya Lavrenov
Browse files
Options

some fixes of cv::mixChannels

parent 52b8bb67
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
modules/core/src/convert.cpp
View file @ 73c96cbd
...@@ -688,7 +688,7 @@ static bool ocl_mixChannels(InputArrayOfArrays _src, InputOutputArrayOfArrays _d ...@@ -688,7 +688,7 @@ static bool ocl_mixChannels(InputArrayOfArrays _src, InputOutputArrayOfArrays _d
if (k.empty()) if (k.empty())
return false; return false;
size_t argindex = 0; int argindex = 0;
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)
...@@ -712,9 +712,11 @@ void cv::mixChannels(InputArrayOfArrays src, InputOutputArrayOfArrays dst, ...@@ -712,9 +712,11 @@ void cv::mixChannels(InputArrayOfArrays src, InputOutputArrayOfArrays dst,
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 &&
src.kind() != _InputArray::STD_VECTOR_UMAT;
bool dst_is_mat = dst.kind() != _InputArray::STD_VECTOR_MAT && bool dst_is_mat = dst.kind() != _InputArray::STD_VECTOR_MAT &&
dst.kind() != _InputArray::STD_VECTOR_VECTOR; dst.kind() != _InputArray::STD_VECTOR_VECTOR &&
dst.kind() != _InputArray::STD_VECTOR_UMAT;
int i; int i;
int nsrc = src_is_mat ? 1 : (int)src.total(); int nsrc = src_is_mat ? 1 : (int)src.total();
int ndst = dst_is_mat ? 1 : (int)dst.total(); int ndst = dst_is_mat ? 1 : (int)dst.total();
...@@ -743,9 +745,11 @@ void cv::mixChannels(InputArrayOfArrays src, InputOutputArrayOfArrays dst, ...@@ -743,9 +745,11 @@ void cv::mixChannels(InputArrayOfArrays src, InputOutputArrayOfArrays dst,
} }
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 &&
src.kind() != _InputArray::STD_VECTOR_UMAT;
bool dst_is_mat = dst.kind() != _InputArray::STD_VECTOR_MAT && bool dst_is_mat = dst.kind() != _InputArray::STD_VECTOR_MAT &&
dst.kind() != _InputArray::STD_VECTOR_VECTOR; dst.kind() != _InputArray::STD_VECTOR_VECTOR &&
dst.kind() != _InputArray::STD_VECTOR_UMAT;
int i; int i;
int nsrc = src_is_mat ? 1 : (int)src.total(); int nsrc = src_is_mat ? 1 : (int)src.total();
int ndst = dst_is_mat ? 1 : (int)dst.total(); int ndst = dst_is_mat ? 1 : (int)dst.total();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment