Enable ipp MeanStdDev calculation for 32F_C1 images. Decrease accuracy sanity check of the perfomance test

This commit is contained in:
vbystricky
2014-04-02 15:45:03 +04:00
parent c29583eacc
commit 9d138b2bbe
2 changed files with 3 additions and 3 deletions

View File

@@ -65,8 +65,8 @@ PERF_TEST_P(Size_MatType, meanStdDev, TYPICAL_MATS)
TEST_CYCLE() meanStdDev(src, mean, dev); TEST_CYCLE() meanStdDev(src, mean, dev);
SANITY_CHECK(mean, 1e-6); SANITY_CHECK(mean, 1e-5, ERROR_RELATIVE);
SANITY_CHECK(dev, 1e-6); SANITY_CHECK(dev, 1e-5, ERROR_RELATIVE);
} }
PERF_TEST_P(Size_MatType, meanStdDev_mask, TYPICAL_MATS) PERF_TEST_P(Size_MatType, meanStdDev_mask, TYPICAL_MATS)

View File

@@ -972,7 +972,7 @@ void cv::meanStdDev( InputArray _src, OutputArray _mean, OutputArray _sdv, Input
ippicviMeanStdDevFuncC1 ippFuncC1 = ippicviMeanStdDevFuncC1 ippFuncC1 =
type == CV_8UC1 ? (ippicviMeanStdDevFuncC1)ippicviMean_StdDev_8u_C1R : type == CV_8UC1 ? (ippicviMeanStdDevFuncC1)ippicviMean_StdDev_8u_C1R :
type == CV_16UC1 ? (ippicviMeanStdDevFuncC1)ippicviMean_StdDev_16u_C1R : type == CV_16UC1 ? (ippicviMeanStdDevFuncC1)ippicviMean_StdDev_16u_C1R :
//type == CV_32FC1 ? (ippicviMeanStdDevFuncC1)ippicviMean_StdDev_32f_C1R ://Aug 2013: bug in IPP 7.1, 8.0 type == CV_32FC1 ? (ippicviMeanStdDevFuncC1)ippicviMean_StdDev_32f_C1R ://Aug 2013: bug in IPP 7.1, 8.0
0; 0;
if( ippFuncC1 ) if( ippFuncC1 )
{ {