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

NORM_L2SQR added too (ticket #1840)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-04-23 12:29:23 +00:00
parent 40f2c716af
commit b8e70ea6c9
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/core/test/test_arithm.cpp
View File

@@ -1227,11 +1227,17 @@ struct NormOp : public BaseElemWiseOp
int getRandomType(RNG& rng)
{
int type = cvtest::randomType(rng, DEPTH_MASK_ALL_BUT_8S, 1, 4);
normType = 1 << rng.uniform(0, 3);
if( CV_MAT_DEPTH(type) == CV_8U && (rng.next() & 8) != 0 )
for(;;)
{
normType = cv::NORM_HAMMING + rng.uniform(0, 2);
type = CV_MAT_DEPTH(type);
normType = rng.uniform(1, 8);
if( normType == NORM_INF || normType == NORM_L1 ||
normType == NORM_L2 || normType == NORM_L2SQR ||
normType == NORM_HAMMING || normType == NORM_HAMMING2 )
break;
}
if( normType == NORM_HAMMING || normType == NORM_HAMMING2 )
{
type = CV_8U;
}
return type;
}