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

Fix source code indents

Browse Source
This commit is contained in:
Max Khardin 2014-01-04 19:01:32 +08:00
parent 214e9d4b12
commit 34b05794d6
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
modules/core/perf/perf_arithm.cpp
View File

@ -203,48 +203,46 @@ PERF_TEST_P(Size_MatType, subtractScalar, TYPICAL_MATS_CORE_ARITHM)
SANITY_CHECK(c, 1e-8); SANITY_CHECK(c, 1e-8);
} }
PERF_TEST_P(Size_MatType, multiply, TYPICAL_MATS_CORE_ARITHM) PERF_TEST_P(Size_MatType, multiply, TYPICAL_MATS_CORE_ARITHM)
{ {
Size sz = get<0>(GetParam()); Size sz = get<0>(GetParam());
int type = get<1>(GetParam()); int type = get<1>(GetParam());
cv::Mat a = Mat(sz, type); cv::Mat a = Mat(sz, type);
cv::Mat b = Mat(sz, type); cv::Mat b = Mat(sz, type);
cv::Mat c = Mat(sz, type); cv::Mat c = Mat(sz, type);
declare.in(a, b, WARMUP_RNG).out(c); declare.in(a, b, WARMUP_RNG).out(c);
if (CV_MAT_DEPTH(type) == CV_32S)
{
//According to docs, saturation is not applied when result is 32bit integer
a /= (2 << 16);
b /= (2 << 16);
}
if (CV_MAT_DEPTH(type) == CV_32S) TEST_CYCLE() multiply(a, b, c);
{
//According to docs, saturation is not applied when result is 32bit integer
a /= (2 << 16);
b /= (2 << 16);
}
TEST_CYCLE() multiply(a, b, c); SANITY_CHECK(c, 1e-8);
SANITY_CHECK(c, 1e-8);
} }
PERF_TEST_P(Size_MatType, multiplyScale, TYPICAL_MATS_CORE_ARITHM) PERF_TEST_P(Size_MatType, multiplyScale, TYPICAL_MATS_CORE_ARITHM)
{ {
Size sz = get<0>(GetParam()); Size sz = get<0>(GetParam());
int type = get<1>(GetParam()); int type = get<1>(GetParam());
cv::Mat a = Mat(sz, type); cv::Mat a = Mat(sz, type);
cv::Mat b = Mat(sz, type); cv::Mat b = Mat(sz, type);
cv::Mat c = Mat(sz, type); cv::Mat c = Mat(sz, type);
double scale = 0.5; double scale = 0.5;
declare.in(a, b, WARMUP_RNG).out(c); declare.in(a, b, WARMUP_RNG).out(c);
if (CV_MAT_DEPTH(type) == CV_32S) if (CV_MAT_DEPTH(type) == CV_32S)
{ {
//According to docs, saturation is not applied when result is 32bit integer //According to docs, saturation is not applied when result is 32bit integer
a /= (2 << 16); a /= (2 << 16);
b /= (2 << 16); b /= (2 << 16);
} }
TEST_CYCLE() multiply(a, b, c, scale); TEST_CYCLE() multiply(a, b, c, scale);
SANITY_CHECK(c, 1e-8); SANITY_CHECK(c, 1e-8);
} }