mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for Bug4243. Made changes relating to non OpenCL devices

Browse Source
This commit is contained in:
Nisarg Thakkar 2015-04-16 00:22:08 +05:30
parent a0bc0ab7cb
commit 00094a8792
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1823,19 +1823,13 @@ void cv::morphologyEx( InputArray _src, OutputArray _dst, int op,
InputArray _kernel, Point anchor, int iterations,
int borderType, const Scalar& borderValue )
{
Mat kernel = _kernel.getMat();
if (kernel.empty())
{
kernel = getStructuringElement(MORPH_RECT, Size(3,3), Point(1,1));
}
#ifdef HAVE_OPENCL
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);
Size ksize = kernel.size();
anchor = normalizeAnchor(anchor, ksize);
CV_OCL_RUN(_dst.isUMat() && _src.dims() <= 2 && _src.channels() <= 4 &&