mirror of
https://github.com/opencv/opencv.git
synced 2024-11-24 11:10:21 +08:00
parent
442f6b4100
commit
21409de176
@ -212,11 +212,17 @@ void cv::copyMakeBorder( InputArray _src, OutputArray _dst, int top, int bottom,
|
||||
top, left, (int)src.elemSize(), borderType );
|
||||
else
|
||||
{
|
||||
double buf[4];
|
||||
scalarToRawData(value, buf, src.type());
|
||||
int cn = src.channels(), cn1 = cn;
|
||||
AutoBuffer<double> buf(cn);
|
||||
if( cn > 4 )
|
||||
{
|
||||
CV_Assert( value[0] == value[1] && value[0] == value[2] && value[0] == value[3] );
|
||||
cn1 = 1;
|
||||
}
|
||||
scalarToRawData(value, buf, CV_MAKETYPE(src.depth(), cn1), cn);
|
||||
copyMakeConstBorder_8u( src.data, src.step, src.size(),
|
||||
dst.data, dst.step, dst.size(),
|
||||
top, left, (int)src.elemSize(), (uchar*)buf );
|
||||
top, left, (int)src.elemSize(), (uchar*)(double*)buf );
|
||||
}
|
||||
}
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -58,8 +58,8 @@ void CV_OptFlowPyrLKTest::run( int )
|
||||
{
|
||||
int code = cvtest::TS::OK;
|
||||
|
||||
const double success_error_level = 0.2;
|
||||
const int bad_points_max = 2;
|
||||
const double success_error_level = 0.3;
|
||||
const int bad_points_max = 8;
|
||||
|
||||
/* test parameters */
|
||||
double max_err = 0., sum_err = 0;
|
||||
@ -139,7 +139,7 @@ void CV_OptFlowPyrLKTest::run( int )
|
||||
status = (char*)cvAlloc(n*sizeof(status[0]));
|
||||
|
||||
/* calculate flow */
|
||||
cvCalcOpticalFlowPyrLK( imgI, imgJ, 0, 0, u, v2, n, cvSize( 20, 20 ),
|
||||
cvCalcOpticalFlowPyrLK( imgI, imgJ, 0, 0, u, v2, n, cvSize( 41, 41 ),
|
||||
4, status, 0, cvTermCriteria( CV_TERMCRIT_ITER|
|
||||
CV_TERMCRIT_EPS, 30, 0.01f ), 0 );
|
||||
|
||||
@ -163,14 +163,6 @@ void CV_OptFlowPyrLKTest::run( int )
|
||||
}
|
||||
|
||||
pt_exceed += err > success_error_level;
|
||||
if( pt_exceed > bad_points_max )
|
||||
{
|
||||
ts->printf( cvtest::TS::LOG,
|
||||
"The number of poorly tracked points is too big (>=%d)\n", pt_exceed );
|
||||
code = cvtest::TS::FAIL_BAD_ACCURACY;
|
||||
goto _exit_;
|
||||
}
|
||||
|
||||
sum_err += err;
|
||||
pt_cmpd++;
|
||||
}
|
||||
@ -186,6 +178,14 @@ void CV_OptFlowPyrLKTest::run( int )
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if( pt_exceed > bad_points_max )
|
||||
{
|
||||
ts->printf( cvtest::TS::LOG,
|
||||
"The number of poorly tracked points is too big (>=%d)\n", pt_exceed );
|
||||
code = cvtest::TS::FAIL_BAD_ACCURACY;
|
||||
goto _exit_;
|
||||
}
|
||||
|
||||
if( max_err > 1 )
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user