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

fixed couple of integral-related bugs

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-04-29 11:55:33 +00:00
parent 8da637854c
commit 9ca45daba3
3 changed files with 7 additions and 6 deletions
modules
imgproc
src
sumpixels.cpp
test
test_filter.cpp
objdetect/src
cascadedetect.cpp

2
modules/imgproc/src/sumpixels.cpp

@ -214,7 +214,7 @@ void integral_##suffix( T* src, size_t srcstep, ST* sum, size_t sumstep, QT* sqs
DEF_INTEGRAL_FUNC(8u32s, uchar, int, double)
DEF_INTEGRAL_FUNC(8u32f, uchar, float, double)
DEF_INTEGRAL_FUNC(8u64f, uchar, double, double)
DEF_INTEGRAL_FUNC(32f, float, float, float)
DEF_INTEGRAL_FUNC(32f, float, float, double)
DEF_INTEGRAL_FUNC(32f64f, float, double, double)
DEF_INTEGRAL_FUNC(64f, double, double, double)

9
modules/imgproc/test/test_filter.cpp

@ -1576,7 +1576,7 @@ CV_IntegralTest::CV_IntegralTest()
test_array[REF_OUTPUT].push_back(NULL);
test_array[REF_OUTPUT].push_back(NULL);
test_array[REF_OUTPUT].push_back(NULL);
element_wise_relative_error = false;
element_wise_relative_error = true;
}
@ -1603,7 +1603,8 @@ void CV_IntegralTest::get_test_array_types_and_sizes( int test_case_idx,
depth = depth == 0 ? CV_8U : CV_32F;
cn += cn == 2;
sum_depth = depth == CV_8U && (cvtest::randInt(rng) & 1) == 1 ? CV_32S : CV_64F;
int b = (cvtest::randInt(rng) & 1) != 0;
sum_depth = depth == CV_8U && b ? CV_32S : b ? CV_32F : CV_64F;
types[INPUT][0] = CV_MAKETYPE(depth,cn);
types[OUTPUT][0] = types[REF_OUTPUT][0] =
@ -1626,10 +1627,10 @@ void CV_IntegralTest::get_test_array_types_and_sizes( int test_case_idx,
}
double CV_IntegralTest::get_success_error_level( int /*test_case_idx*/, int i, int j )
double CV_IntegralTest::get_success_error_level( int, int i, int j )
{
int depth = test_mat[i][j].depth();
return depth == CV_32S ? 0 : FLT_EPSILON;
return depth == CV_32S ? 0 : depth == CV_64F ? FLT_EPSILON : 5e-3;
}

2
modules/objdetect/src/cascadedetect.cpp

@ -622,7 +622,7 @@ bool HaarEvaluator::setImage( const Mat &image, Size _origWinSize )
tilted0.create( rn, cn, CV_32S);
}
sum = Mat(rn, cn, CV_32S, sum0.data);
sqsum = Mat(rn, cn, CV_32S, sqsum0.data);
sqsum = Mat(rn, cn, CV_64F, sqsum0.data);
if( hasTiltedFeatures )
{