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

Merge pull request #2688 from akarsakov:ipp_disable_resize_8u

Browse Source
This commit is contained in:
Alexander Alekhin 2014-05-05 15:21:12 +04:00 committed by OpenCV Buildbot
commit a5378186e5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/src/imgwarp.cpp
View File

@ -1930,9 +1930,11 @@ public:
switch (type) switch (type)
{ {
#if 0 // disabled since it breaks tests for CascadeClassifier
case CV_8UC1: SET_IPP_RESIZE_PTR(8u,C1); break; case CV_8UC1: SET_IPP_RESIZE_PTR(8u,C1); break;
case CV_8UC3: SET_IPP_RESIZE_PTR(8u,C3); break; case CV_8UC3: SET_IPP_RESIZE_PTR(8u,C3); break;
case CV_8UC4: SET_IPP_RESIZE_PTR(8u,C4); break; case CV_8UC4: SET_IPP_RESIZE_PTR(8u,C4); break;
#endif
case CV_16UC1: SET_IPP_RESIZE_PTR(16u,C1); break; case CV_16UC1: SET_IPP_RESIZE_PTR(16u,C1); break;
case CV_16UC3: SET_IPP_RESIZE_PTR(16u,C3); break; case CV_16UC3: SET_IPP_RESIZE_PTR(16u,C3); break;
case CV_16UC4: SET_IPP_RESIZE_PTR(16u,C4); break; case CV_16UC4: SET_IPP_RESIZE_PTR(16u,C4); break;
@ -2411,7 +2413,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,
mode = ippCubic; mode = ippCubic;
if( mode >= 0 && (cn == 1 || cn == 3 || cn == 4) && if( mode >= 0 && (cn == 1 || cn == 3 || cn == 4) &&
(depth == CV_8U || depth == CV_16U || depth == CV_16S || depth == CV_32F || (depth == CV_16U || depth == CV_16S || depth == CV_32F ||
(depth == CV_64F && mode == ippLinear))) (depth == CV_64F && mode == ippLinear)))
{ {
bool ok = true; bool ok = true;