generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for Bug4243

Browse Source
This commit is contained in:
Nisarg Thakkar 2015-04-15 23:49:01 +05:30
parent 81c5d58035
commit a0bc0ab7cb
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/imgproc/src/morph.cpp
View File

@ -1820,11 +1820,22 @@ static bool ocl_morphologyEx(InputArray _src, OutputArray _dst, int op,
#endif #endif
void cv::morphologyEx( InputArray _src, OutputArray _dst, int op, void cv::morphologyEx( InputArray _src, OutputArray _dst, int op,
InputArray kernel, Point anchor, int iterations, InputArray _kernel, Point anchor, int iterations,
int borderType, const Scalar& borderValue ) int borderType, const Scalar& borderValue )
{ {
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
Size ksize = kernel.size(); Size ksize = _kernel.size();
Mat tempKernel;
if (ksize.height==0 || ksize.width==0)
{
tempKernel = getStructuringElement(MORPH_RECT, Size(3,3), Point(1,1));
ksize = tempKernel.size();
}
else
{
tempKernel = _kernel.getMat();
}
InputArray kernel = InputArray(tempKernel);
anchor = normalizeAnchor(anchor, ksize); anchor = normalizeAnchor(anchor, ksize);
CV_OCL_RUN(_dst.isUMat() && _src.dims() <= 2 && _src.channels() <= 4 && CV_OCL_RUN(_dst.isUMat() && _src.dims() <= 2 && _src.channels() <= 4 &&