1 --- a/include/opencv/cvcompat.h 2006-07-12 15:48:54.000000000 +0000
2 +++ b/include/opencv/cvcompat.h 2008-08-28 22:52:08.000000000 +0000
5 /* Changes RNG range while preserving RNG state */
6 CV_INLINE void cvRandSetRange( CvRandState* state, double param1,
7 - double param2, int index CV_DEFAULT(-1))
8 + double param2, int idx CV_DEFAULT(-1))
16 - if( (unsigned)(index + 1) > 4 )
17 + if( (unsigned)(idx + 1) > 4 )
19 cvError( CV_StsOutOfRange, "cvRandSetRange", "index is not in -1..3", "cvcompat.h", 0 );
26 state->param[0].val[0] = state->param[0].val[1] =
27 state->param[0].val[2] = state->param[0].val[3] = param1;
32 - state->param[0].val[index] = param1;
33 - state->param[1].val[index] = param2;
34 + state->param[0].val[idx] = param1;
35 + state->param[1].val[idx] = param2;
40 CV_INLINE void cvbCartToPolar( const float* y, const float* x,
41 float* magnitude, float* angle, int len )
43 - CvMat mx = cvMat( 1, len, CV_32F, (void*)x );
44 + CvMat mx = cvMat( 1, len, CV_32F, (void*)(long)x );
49 - my.data.fl = (float*)y;
50 + my.data.fl = (float*)(long)y;
51 mm.data.fl = (float*)magnitude;
52 ma.data.fl = (float*)angle;
55 CV_INLINE void cvbFastArctan( const float* y, const float* x,
56 float* angle, int len )
58 - CvMat mx = cvMat( 1, len, CV_32F, (void*)x );
59 + CvMat mx = cvMat( 1, len, CV_32F, (void*)(long)x );
63 - my.data.fl = (float*)y;
64 + my.data.fl = (float*)(long)y;
65 ma.data.fl = (float*)angle;
67 cvCartToPolar( &mx, &my, NULL, &ma, 1 );
70 CV_INLINE void cvbSqrt( const float* x, float* y, int len )
72 - CvMat mx = cvMat( 1, len, CV_32F, (void*)x );
73 + CvMat mx = cvMat( 1, len, CV_32F, (void*)(long)x );
75 my.data.fl = (float*)y;
79 CV_INLINE void cvbInvSqrt( const float* x, float* y, int len )
81 - CvMat mx = cvMat( 1, len, CV_32F, (void*)x );
82 + CvMat mx = cvMat( 1, len, CV_32F, (void*)(long)x );
84 my.data.fl = (float*)y;
88 CV_INLINE void cvbReciprocal( const float* x, float* y, int len )
90 - CvMat mx = cvMat( 1, len, CV_32F, (void*)x );
91 + CvMat mx = cvMat( 1, len, CV_32F, (void*)(long)x );
93 my.data.fl = (float*)y;
97 CV_INLINE void cvbFastExp( const float* x, double* y, int len )
99 - CvMat mx = cvMat( 1, len, CV_32F, (void*)x );
100 + CvMat mx = cvMat( 1, len, CV_32F, (void*)(long)x );
101 CvMat my = cvMat( 1, len, CV_64F, y );
106 CV_INLINE void cvbFastLog( const double* x, float* y, int len )
108 - CvMat mx = cvMat( 1, len, CV_64F, (void*)x );
109 + CvMat mx = cvMat( 1, len, CV_64F, (void*)(long)x );
110 CvMat my = cvMat( 1, len, CV_32F, y );
114 vect2->x = pt[3].x - pt[0].x;
115 vect2->y = pt[3].y - pt[0].y;
117 - CV_UNREFERENCED( (left, bottom, right, top) );
118 + CV_UNREFERENCED((void)left);
119 + CV_UNREFERENCED((void)bottom);
120 + CV_UNREFERENCED((void)right);
121 + CV_UNREFERENCED((void)top);
124 typedef int CvDisType;
127 CV_INLINE void cvFitEllipse( const CvPoint2D32f* points, int count, CvBox2D* box )
129 - CvMat mat = cvMat( 1, count, CV_32FC2, (void*)points );
130 + CvMat mat = cvMat( 1, count, CV_32FC2, (void*)(long)points );
131 *box = cvFitEllipse2( &mat );
135 const float* distortion_coeffs,
136 int CV_UNREFERENCED(interpolate) )
138 - CvMat _a = cvMat( 3, 3, CV_32F, (void*)intrinsic_matrix );
139 - CvMat _k = cvMat( 4, 1, CV_32F, (void*)distortion_coeffs );
140 + CvMat _a = cvMat( 3, 3, CV_32F, (void*)(long)intrinsic_matrix );
141 + CvMat _k = cvMat( 4, 1, CV_32F, (void*)(long)distortion_coeffs );
142 cvUndistort2( src, dst, &_a, &_k );
146 float* lower_bound CV_DEFAULT(0),
147 void* user_param CV_DEFAULT(0))
149 - CvMat sign1 = cvMat( size1, dims + 1, CV_32FC1, (void*)signature1 );
150 - CvMat sign2 = cvMat( size2, dims + 1, CV_32FC1, (void*)signature2 );
151 + CvMat sign1 = cvMat( size1, dims + 1, CV_32FC1, (void*)(long)signature1 );
152 + CvMat sign2 = cvMat( size2, dims + 1, CV_32FC1, (void*)(long)signature2 );
154 return cvCalcEMD2( &sign1, &sign2, dist_type, dist_func, 0, 0, lower_bound, user_param );
156 --- a/include/opencv/cxcore.h 2009-11-29 12:41:25.000000000 +0900
157 +++ b/include/opencv/cxcore.h 2009-11-29 12:42:59.000000000 +0900
158 @@ -1152,9 +1152,9 @@
160 /* Returns a set element by index. If the element doesn't belong to the set,
\r
161 NULL is returned */
\r
162 -CV_INLINE CvSetElem* cvGetSetElem( const CvSet* set_header, int index )
\r
163 +CV_INLINE CvSetElem* cvGetSetElem( const CvSet* set_header, int idx )
\r
165 - CvSetElem* elem = (CvSetElem*)cvGetSeqElem( (CvSeq*)set_header, index );
\r
166 + CvSetElem* elem = (CvSetElem*)cvGetSeqElem( (CvSeq*)set_header, idx );
\r
167 return elem && CV_IS_SET_ELEM( elem ) ? elem : 0;
\r
170 --- a/include/opencv/highgui.h 2009-11-29 12:45:02.000000000 +0900
171 +++ b/include/opencv/highgui.h 2009-11-29 12:45:13.000000000 +0900
173 /* this function is used to set some external parameters in case of X Window */
174 CVAPI(int) cvInitSystem( int argc, char** argv );
176 -CVAPI(int) cvStartWindowThread();
177 +CVAPI(int) cvStartWindowThread(void);
179 #define CV_WINDOW_AUTOSIZE 1