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

Merge pull request #3032 from vpisarev:refactor_ml2

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-08-04 14:51:37 +00:00
parent dbedc63c55 cb9b88e65b
commit 432b7cb235
68 changed files with 20952 additions and 32884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1221,7 +1221,7 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
IPP_MORPH_CASE(CV_32FC3, 32f_C3R, 32f);
IPP_MORPH_CASE(CV_32FC4, 32f_C4R, 32f);
default:
return false;
;
}
#undef IPP_MORPH_CASE
@@ -1253,14 +1253,11 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
IPP_MORPH_CASE(CV_32FC3, 32f_C3R, 32f);
IPP_MORPH_CASE(CV_32FC4, 32f_C4R, 32f);
default:
return false;
;
}
#undef IPP_MORPH_CASE
#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ >= 8
return false; /// It disables false positive warning in GCC 4.8 and further
#endif
}
return false;
}
static bool IPPMorphOp(int op, InputArray _src, OutputArray _dst,