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

Merge pull request #3138 from alalek:icv_update

Browse Source
This commit is contained in:
Alexander Alekhin
2014-11-06 15:58:14 +00:00
parent ff095bbbfc 58e054a003
commit f50f249f80
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/imgproc/src/smooth.cpp
View File

@@ -1223,15 +1223,17 @@ void cv::boxFilter( InputArray _src, OutputArray _dst, int ddepth,
else if (stype == CV_8UC4)
IPP_FILTER_BOX_BORDER(Ipp8u, ipp8u, 8u_C4R);
else if (stype == CV_16UC1)
IPP_FILTER_BOX_BORDER(Ipp16u, ipp16u, 16u_C1R);
// Oct 2014: performance with BORDER_CONSTANT
//else if (stype == CV_16UC1)
// IPP_FILTER_BOX_BORDER(Ipp16u, ipp16u, 16u_C1R);
else if (stype == CV_16UC3)
IPP_FILTER_BOX_BORDER(Ipp16u, ipp16u, 16u_C3R);
else if (stype == CV_16UC4)
IPP_FILTER_BOX_BORDER(Ipp16u, ipp16u, 16u_C4R);
else if (stype == CV_16SC1)
IPP_FILTER_BOX_BORDER(Ipp16s, ipp16s, 16s_C1R);
// Oct 2014: performance with BORDER_CONSTANT
//else if (stype == CV_16SC1)
// IPP_FILTER_BOX_BORDER(Ipp16s, ipp16s, 16s_C1R);
else if (stype == CV_16SC3)
IPP_FILTER_BOX_BORDER(Ipp16s, ipp16s, 16s_C3R);
else if (stype == CV_16SC4)