Skip to content

O
opencv
Commit a5378186 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #2688 from akarsakov:ipp_disable_resize_8u

parents d9d9de75 4ebe7609
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
modules/imgproc/src/imgwarp.cpp
View file @ a5378186
...@@ -1930,9 +1930,11 @@ public: ...@@ -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, ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment