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

cosmetic changes, removed trailing spaces

Browse Source
This commit is contained in:
Vladimir Dudnik 2010-12-23 23:05:35 +00:00
parent b6f53fc465
commit eedde64902
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cv/src/aaccum.cpp
View File

@ -77,7 +77,9 @@ CV_AccumBaseTestImpl::CV_AccumBaseTestImpl( const char* test_name, const char* t
size_list = accum_sizes; size_list = accum_sizes;
whole_size_list = accum_whole_sizes; whole_size_list = accum_whole_sizes;
cn_list = accum_channels; cn_list = accum_channels;
}
return;
} // ctor
void CV_AccumBaseTestImpl::get_test_array_types_and_sizes( int test_case_idx, void CV_AccumBaseTestImpl::get_test_array_types_and_sizes( int test_case_idx,
@ -94,9 +96,12 @@ void CV_AccumBaseTestImpl::get_test_array_types_and_sizes( int test_case_idx,
for( i = 0; i < input_count; i++ ) for( i = 0; i < input_count; i++ )
types[INPUT][i] = CV_MAKETYPE(depth,cn); types[INPUT][i] = CV_MAKETYPE(depth,cn);
types[INPUT_OUTPUT][0] = types[REF_INPUT_OUTPUT][0] = types[TEMP][0] = CV_MAKETYPE(accdepth,cn); types[INPUT_OUTPUT][0] = types[REF_INPUT_OUTPUT][0] = types[TEMP][0] = CV_MAKETYPE(accdepth,cn);
alpha = cvTsRandReal(rng); alpha = cvTsRandReal(rng);
return;
} }
@ -108,12 +113,13 @@ double CV_AccumBaseTestImpl::get_success_error_level( int /*test_case_idx*/, int
void CV_AccumBaseTestImpl::get_timing_test_array_types_and_sizes( int test_case_idx, void CV_AccumBaseTestImpl::get_timing_test_array_types_and_sizes( int test_case_idx,
CvSize** sizes, int** types, CvSize** whole_sizes, bool *are_images ) CvSize** sizes, int** types, CvSize** whole_sizes, bool* are_images )
{ {
CvArrTest::get_timing_test_array_types_and_sizes( test_case_idx, sizes, types, CvArrTest::get_timing_test_array_types_and_sizes( test_case_idx, sizes, types,
whole_sizes, are_images ); whole_sizes, are_images );
types[INPUT_OUTPUT][0] = CV_MAKETYPE(MAX(CV_32F, CV_MAT_DEPTH(types[INPUT][0])), types[INPUT_OUTPUT][0] = CV_MAKETYPE(MAX(CV_32F, CV_MAT_DEPTH(types[INPUT][0])),
CV_MAT_CN(types[INPUT][0])); CV_MAT_CN(types[INPUT][0]));
alpha = 0.333333333333333; alpha = 0.333333333333333;
} }
@ -150,13 +156,14 @@ protected:
void prepare_to_validation( int ); void prepare_to_validation( int );
}; };
CV_AccTest::CV_AccTest()
CV_AccTest::CV_AccTest(void)
: CV_AccumBaseTest( "accum-acc", "cvAcc" ) : CV_AccumBaseTest( "accum-acc", "cvAcc" )
{ {
} }
void CV_AccTest::run_func() void CV_AccTest::run_func(void)
{ {
cvAcc( test_array[INPUT][0], test_array[INPUT_OUTPUT][0], test_array[MASK][0] ); cvAcc( test_array[INPUT][0], test_array[INPUT_OUTPUT][0], test_array[MASK][0] );
} }
@ -171,6 +178,7 @@ void CV_AccTest::prepare_to_validation( int )
cvTsAdd( src, cvScalarAll(1.), dst, cvScalarAll(1.), cvScalarAll(0.), temp, 0 ); cvTsAdd( src, cvScalarAll(1.), dst, cvScalarAll(1.), cvScalarAll(0.), temp, 0 );
cvTsCopy( temp, dst, mask ); cvTsCopy( temp, dst, mask );
return;
} }
CV_AccTest acc_test; CV_AccTest acc_test;