X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=tests%2Fcv%2Fsrc%2Faconvhull.cpp;fp=tests%2Fcv%2Fsrc%2Faconvhull.cpp;h=551cdef2b8a8724e3189c4e72ef67bfc0d5b5596;hb=80cd7b93506cc1926882d5fd08a2c74ee9359e29;hp=7bd9ea70b33e42c70a5812656c6218fcfaf324c4;hpb=467a270adf12425827305759c0c4ea8f5b2b3854;p=opencv diff --git a/tests/cv/src/aconvhull.cpp b/tests/cv/src/aconvhull.cpp index 7bd9ea7..551cdef 100644 --- a/tests/cv/src/aconvhull.cpp +++ b/tests/cv/src/aconvhull.cpp @@ -271,7 +271,7 @@ void CV_BaseShapeDescrTest::generate_point_set( void* points ) CvSeqReader reader; uchar* data = 0; double a[4], b[4]; - + for( k = 0; k < 4; k++ ) { a[k] = high.val[k] - low.val[k]; @@ -547,7 +547,7 @@ int CV_ConvHullTest::validate_test_results( int test_case_idx ) for( i = 0; i < hull_count; i++ ) { - char* ptr = reader.ptr; + schar* ptr = reader.ptr; int idx; CV_NEXT_SEQ_ELEM( hseq->elem_size, reader ); @@ -910,7 +910,7 @@ int CV_PerimeterTest::validate_test_results( int test_case_idx ) len = MIN( len, total ); len -= !is_closed && len == total; - + ptr = (CvPoint2D32f*)points2->data.fl; prev_pt = ptr[slice.start_index % total]; @@ -1375,12 +1375,12 @@ cvTsGenerateTousledBlob( CvPoint2D32f center, CvSize2D32f axes, } assert( point_type == CV_32SC2 || point_type == CV_32FC2 ); - + for( i = 0; i < total; i++ ) { CvPoint* pp; CvPoint2D32f p; - + double phi0 = 2*CV_PI*i/total; double phi = CV_PI*angle/180.; double t = cvTsRandReal(rng)*max_r_scale + (1 - max_r_scale); @@ -1398,7 +1398,7 @@ cvTsGenerateTousledBlob( CvPoint2D32f center, CvSize2D32f axes, } else pp = ((CvPoint*)data) + i; - + if( point_type == CV_32SC2 ) { pp->x = cvRound(p.x);