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

fixed crashes in camshiftdemo sample

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-28 19:44:01 +00:00
parent 921c68de57
commit a3dfba36a1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/drawing.cpp
View File

@ -892,7 +892,7 @@ EllipseEx( Mat& img, Point center, Size axes,
int angle, int arc_start, int arc_end,
const void* color, int thickness, int line_type )
{
CV_Assert( axes.width >= 0 && axes.height >= 0 );
axes.width = std::abs(axes.width), axes.height = std::abs(axes.height);
int delta = (std::max(axes.width,axes.height)+(XY_ONE>>1))>>XY_SHIFT;
delta = delta < 3 ? 90 : delta < 10 ? 30 : delta < 15 ? 18 : 5;

7
modules/video/src/camshift.cpp
View File

@ -80,9 +80,7 @@ cvMeanShift( const void* imgProb, CvRect windowIn,
if( windowIn.height <= 0 || windowIn.width <= 0 )
CV_Error( CV_StsBadArg, "Input window has non-positive sizes" );
if( windowIn.x < 0 || windowIn.x + windowIn.width > mat->cols ||
windowIn.y < 0 || windowIn.y + windowIn.height > mat->rows )
CV_Error( CV_StsBadArg, "Initial window is not inside the image ROI" );
windowIn = cv::Rect(windowIn) & cv::Rect(0, 0, mat->cols, mat->rows);
criteria = cvCheckTermCriteria( criteria, 1., 100 );
eps = cvRound( criteria.epsilon * criteria.epsilon );
@ -91,7 +89,8 @@ cvMeanShift( const void* imgProb, CvRect windowIn,
{
int dx, dy, nx, ny;
double inv_m00;
cur_rect = cv::Rect(cur_rect) & cv::Rect(0, 0, mat->cols, mat->rows);
cvGetSubRect( mat, &cur_win, cur_rect );
cvMoments( &cur_win, &moments );