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

Merge pull request #3932 from nisargthakkar:Bug4243

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-04-21 12:18:37 +00:00
parent 60a51b82d7 00094a8792
commit 4c875dc393
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1820,9 +1820,14 @@ 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 )
{ {
Mat kernel = _kernel.getMat();
if (kernel.empty())
{
kernel = getStructuringElement(MORPH_RECT, Size(3,3), Point(1,1));
}
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
Size ksize = kernel.size(); Size ksize = kernel.size();
anchor = normalizeAnchor(anchor, ksize); anchor = normalizeAnchor(anchor, ksize);