1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

optimized cv::norm with NORM_RELATIVE

This commit is contained in:
Ilya Lavrenov
2014-06-07 20:53:20 +04:00
parent 2040995801
commit 5403bdd228
4 changed files with 47 additions and 18 deletions
+12
View File
@@ -1293,6 +1293,8 @@ OCL_TEST_P(Norm, NORM_INF_2args)
{
generateTestData();
SCOPED_TRACE(relative ? "NORM_RELATIVE" : "");
int type = NORM_INF;
if (relative == 1)
type |= NORM_RELATIVE;
@@ -1311,6 +1313,8 @@ OCL_TEST_P(Norm, NORM_INF_2args_mask)
{
generateTestData();
SCOPED_TRACE(relative ? "NORM_RELATIVE" : "");
int type = NORM_INF;
if (relative == 1)
type |= NORM_RELATIVE;
@@ -1329,6 +1333,8 @@ OCL_TEST_P(Norm, NORM_L1_2args)
{
generateTestData();
SCOPED_TRACE(relative ? "NORM_RELATIVE" : "");
int type = NORM_L1;
if (relative == 1)
type |= NORM_RELATIVE;
@@ -1347,6 +1353,8 @@ OCL_TEST_P(Norm, NORM_L1_2args_mask)
{
generateTestData();
SCOPED_TRACE(relative ? "NORM_RELATIVE" : "");
int type = NORM_L1;
if (relative == 1)
type |= NORM_RELATIVE;
@@ -1365,6 +1373,8 @@ OCL_TEST_P(Norm, NORM_L2_2args)
{
generateTestData();
SCOPED_TRACE(relative ? "NORM_RELATIVE" : "");
int type = NORM_L2;
if (relative == 1)
type |= NORM_RELATIVE;
@@ -1383,6 +1393,8 @@ OCL_TEST_P(Norm, NORM_L2_2args_mask)
{
generateTestData();
SCOPED_TRACE(relative ? "NORM_RELATIVE" : "");
int type = NORM_L2;
if (relative == 1)
type |= NORM_RELATIVE;