Skip to content

Commit d25cbaa

Browse files
vpisarevvpisarev
committed
Merge pull request opencv#9293 from sovrasov:assert_improvement
2 parents 4970a56 + 9a10bdb commit d25cbaa

File tree

2 files changed

+40
-25
lines changed

2 files changed

+40
-25
lines changed

‎modules/core/include/opencv2/core/base.hpp

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,22 @@ The macros CV_Assert (and CV_DbgAssert(expr)) evaluate the specified expression.
424424
raise an error (see cv::error). The macro CV_Assert checks the condition in both Debug and Release
425425
configurations while CV_DbgAssert is only retained in the Debug configuration.
426426
*/
427-
#define CV_Assert( expr ) if(!!(expr)) ; else cv::error( cv::Error::StsAssert, #expr, CV_Func, __FILE__, __LINE__ )
427+
428+
#define CV_VA_NUM_ARGS_HELPER(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
429+
#define CV_VA_NUM_ARGS(...) CV_VA_NUM_ARGS_HELPER(__VA_ARGS__, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1)
430+
431+
#define CV_Assert_1( expr ) if(!!(expr)) ; else cv::error( cv::Error::StsAssert, #expr, CV_Func, __FILE__, __LINE__ )
432+
#define CV_Assert_2( expr1, expr2 ) CV_Assert_1(expr1); CV_Assert_1(expr2)
433+
#define CV_Assert_3( expr1, expr2, expr3 ) CV_Assert_2(expr1, expr2); CV_Assert_1(expr3)
434+
#define CV_Assert_4( expr1, expr2, expr3, expr4 ) CV_Assert_3(expr1, expr2, expr3); CV_Assert_1(expr4)
435+
#define CV_Assert_5( expr1, expr2, expr3, expr4, expr5 ) CV_Assert_4(expr1, expr2, expr3, expr4); CV_Assert_1(expr5)
436+
#define CV_Assert_6( expr1, expr2, expr3, expr4, expr5, expr6 ) CV_Assert_5(expr1, expr2, expr3, expr4, expr5); CV_Assert_1(expr6)
437+
#define CV_Assert_7( expr1, expr2, expr3, expr4, expr5, expr6, expr7 ) CV_Assert_6(expr1, expr2, expr3, expr4, expr5, expr6 ); CV_Assert_1(expr7)
438+
#define CV_Assert_8( expr1, expr2, expr3, expr4, expr5, expr6, expr7, expr8 ) CV_Assert_7(expr1, expr2, expr3, expr4, expr5, expr6, expr7 ); CV_Assert_1(expr8)
439+
#define CV_Assert_9( expr1, expr2, expr3, expr4, expr5, expr6, expr7, expr8, expr9 ) CV_Assert_8(expr1, expr2, expr3, expr4, expr5, expr6, expr7, expr8 ); CV_Assert_1(expr9)
440+
#define CV_Assert_10( expr1, expr2, expr3, expr4, expr5, expr6, expr7, expr8, expr9, expr10 ) CV_Assert_9(expr1, expr2, expr3, expr4, expr5, expr6, expr7, expr8, expr9 ); CV_Assert_1(expr10)
441+
442+
#define CV_Assert(...) CVAUX_CONCAT(CV_Assert_, CV_VA_NUM_ARGS(__VA_ARGS__)) (__VA_ARGS__)
428443

429444
/** same as CV_Error(code,msg), but does not return */
430445
#define CV_ErrorNoReturn( code, msg ) cv::errorNoReturn( code, msg, CV_Func, __FILE__, __LINE__ )

‎modules/core/src/matmul.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ static bool ocl_gemm( InputArray matA, InputArray matB, double alpha,
796796
int depth = matA.depth(), cn = matA.channels();
797797
int type = CV_MAKETYPE(depth, cn);
798798

799-
CV_Assert( type == matB.type() && (type == CV_32FC1 || type == CV_64FC1 || type == CV_32FC2 || type == CV_64FC2) );
799+
CV_Assert( type == matB.type(), (type == CV_32FC1 || type == CV_64FC1 || type == CV_32FC2 || type == CV_64FC2) );
800800

801801
const ocl::Device & dev = ocl::Device::getDefault();
802802
bool doubleSupport = dev.doubleFPConfig() > 0;
@@ -1555,7 +1555,7 @@ void cv::gemm( InputArray matA, InputArray matB, double alpha,
15551555
Size a_size = A.size(), d_size;
15561556
int len = 0, type = A.type();
15571557

1558-
CV_Assert( type == B.type() && (type == CV_32FC1 || type == CV_64FC1 || type == CV_32FC2 || type == CV_64FC2) );
1558+
CV_Assert( type == B.type(), (type == CV_32FC1 || type == CV_64FC1 || type == CV_32FC2 || type == CV_64FC2) );
15591559

15601560
switch( flags & (GEMM_1_T|GEMM_2_T) )
15611561
{
@@ -1583,7 +1583,7 @@ void cv::gemm( InputArray matA, InputArray matB, double alpha,
15831583

15841584
if( !C.empty() )
15851585
{
1586-
CV_Assert( C.type() == type &&
1586+
CV_Assert( C.type() == type,
15871587
(((flags&GEMM_3_T) == 0 && C.rows == d_size.height && C.cols == d_size.width) ||
15881588
((flags&GEMM_3_T) != 0 && C.rows == d_size.width && C.cols == d_size.height)));
15891589
}
@@ -2537,7 +2537,7 @@ void cv::calcCovarMatrix( const Mat* data, int nsamples, Mat& covar, Mat& _mean,
25372537
{
25382538
CV_INSTRUMENT_REGION()
25392539

2540-
CV_Assert( data && nsamples > 0 );
2540+
CV_Assert( data, nsamples > 0 );
25412541
Size size = data[0].size();
25422542
int sz = size.width * size.height, esz = (int)data[0].elemSize();
25432543
int type = data[0].type();
@@ -2560,7 +2560,7 @@ void cv::calcCovarMatrix( const Mat* data, int nsamples, Mat& covar, Mat& _mean,
25602560

25612561
for( int i = 0; i < nsamples; i++ )
25622562
{
2563-
CV_Assert( data[i].size() == size && data[i].type() == type );
2563+
CV_Assert( data[i].size() == size, data[i].type() == type );
25642564
if( data[i].isContinuous() )
25652565
memcpy( _data.ptr(i), data[i].ptr(), sz*esz );
25662566
else
@@ -2596,7 +2596,7 @@ void cv::calcCovarMatrix( InputArray _src, OutputArray _covar, InputOutputArray
25962596
int i = 0;
25972597
for(std::vector<cv::Mat>::iterator each = src.begin(); each != src.end(); ++each, ++i )
25982598
{
2599-
CV_Assert( (*each).size() == size && (*each).type() == type );
2599+
CV_Assert( (*each).size() == size, (*each).type() == type );
26002600
Mat dataRow(size.height, size.width, type, _data.ptr(i));
26012601
(*each).copyTo(dataRow);
26022602
}
@@ -2675,8 +2675,8 @@ double cv::Mahalanobis( InputArray _v1, InputArray _v2, InputArray _icovar )
26752675
AutoBuffer<double> buf(len);
26762676
double result = 0;
26772677

2678-
CV_Assert( type == v2.type() && type == icovar.type() &&
2679-
sz == v2.size() && len == icovar.rows && len == icovar.cols );
2678+
CV_Assert( type == v2.type(), type == icovar.type(),
2679+
sz == v2.size(), len == icovar.rows && len == icovar.cols );
26802680

26812681
sz.width *= v1.channels();
26822682
if( v1.isContinuous() && v2.isContinuous() )
@@ -2968,8 +2968,8 @@ void cv::mulTransposed( InputArray _src, OutputArray _dst, bool ata,
29682968

29692969
if( !delta.empty() )
29702970
{
2971-
CV_Assert( delta.channels() == 1 &&
2972-
(delta.rows == src.rows || delta.rows == 1) &&
2971+
CV_Assert( delta.channels() == 1,
2972+
(delta.rows == src.rows || delta.rows == 1),
29732973
(delta.cols == src.cols || delta.cols == 1));
29742974
if( delta.type() != dtype )
29752975
delta.convertTo(delta, dtype);
@@ -3380,7 +3380,7 @@ double Mat::dot(InputArray _mat) const
33803380
Mat mat = _mat.getMat();
33813381
int cn = channels();
33823382
DotProdFunc func = getDotProdFunc(depth());
3383-
CV_Assert( mat.type() == type() && mat.size == size && func != 0 );
3383+
CV_Assert( mat.type() == type(), mat.size == size, func != 0 );
33843384

33853385
if( isContinuous() && mat.isContinuous() )
33863386
{
@@ -3416,8 +3416,8 @@ CV_IMPL void cvGEMM( const CvArr* Aarr, const CvArr* Barr, double alpha,
34163416
if( Carr )
34173417
C = cv::cvarrToMat(Carr);
34183418

3419-
CV_Assert( (D.rows == ((flags & CV_GEMM_A_T) == 0 ? A.rows : A.cols)) &&
3420-
(D.cols == ((flags & CV_GEMM_B_T) == 0 ? B.cols : B.rows)) &&
3419+
CV_Assert( (D.rows == ((flags & CV_GEMM_A_T) == 0 ? A.rows : A.cols)),
3420+
(D.cols == ((flags & CV_GEMM_B_T) == 0 ? B.cols : B.rows)),
34213421
D.type() == A.type() );
34223422

34233423
gemm( A, B, alpha, C, beta, D, flags );
@@ -3439,7 +3439,7 @@ cvTransform( const CvArr* srcarr, CvArr* dstarr,
34393439
m = _m;
34403440
}
34413441

3442-
CV_Assert( dst.depth() == src.depth() && dst.channels() == m.rows );
3442+
CV_Assert( dst.depth() == src.depth(), dst.channels() == m.rows );
34433443
cv::transform( src, dst, m );
34443444
}
34453445

@@ -3449,7 +3449,7 @@ cvPerspectiveTransform( const CvArr* srcarr, CvArr* dstarr, const CvMat* mat )
34493449
{
34503450
cv::Mat m = cv::cvarrToMat(mat), src = cv::cvarrToMat(srcarr), dst = cv::cvarrToMat(dstarr);
34513451

3452-
CV_Assert( dst.type() == src.type() && dst.channels() == m.rows-1 );
3452+
CV_Assert( dst.type() == src.type(), dst.channels() == m.rows-1 );
34533453
cv::perspectiveTransform( src, dst, m );
34543454
}
34553455

@@ -3459,7 +3459,7 @@ CV_IMPL void cvScaleAdd( const CvArr* srcarr1, CvScalar scale,
34593459
{
34603460
cv::Mat src1 = cv::cvarrToMat(srcarr1), dst = cv::cvarrToMat(dstarr);
34613461

3462-
CV_Assert( src1.size == dst.size && src1.type() == dst.type() );
3462+
CV_Assert( src1.size == dst.size, src1.type() == dst.type() );
34633463
cv::scaleAdd( src1, scale.val[0], cv::cvarrToMat(srcarr2), dst );
34643464
}
34653465

@@ -3469,7 +3469,7 @@ cvCalcCovarMatrix( const CvArr** vecarr, int count,
34693469
CvArr* covarr, CvArr* avgarr, int flags )
34703470
{
34713471
cv::Mat cov0 = cv::cvarrToMat(covarr), cov = cov0, mean0, mean;
3472-
CV_Assert( vecarr != 0 && count >= 1 );
3472+
CV_Assert( vecarr != 0, count >= 1 );
34733473

34743474
if( avgarr )
34753475
mean = mean0 = cv::cvarrToMat(avgarr);
@@ -3549,9 +3549,9 @@ cvCalcPCA( const CvArr* data_arr, CvArr* avg_arr, CvArr* eigenvals, CvArr* eigen
35493549
int ecount0 = evals0.cols + evals0.rows - 1;
35503550
int ecount = evals.cols + evals.rows - 1;
35513551

3552-
CV_Assert( (evals0.cols == 1 || evals0.rows == 1) &&
3553-
ecount0 <= ecount &&
3554-
evects0.cols == evects.cols &&
3552+
CV_Assert( (evals0.cols == 1 || evals0.rows == 1),
3553+
ecount0 <= ecount,
3554+
evects0.cols == evects.cols,
35553555
evects0.rows == ecount0 );
35563556

35573557
cv::Mat temp = evals0;
@@ -3580,12 +3580,12 @@ cvProjectPCA( const CvArr* data_arr, const CvArr* avg_arr,
35803580
int n;
35813581
if( mean.rows == 1 )
35823582
{
3583-
CV_Assert(dst.cols <= evects.rows && dst.rows == data.rows);
3583+
CV_Assert(dst.cols <= evects.rows, dst.rows == data.rows);
35843584
n = dst.cols;
35853585
}
35863586
else
35873587
{
3588-
CV_Assert(dst.rows <= evects.rows && dst.cols == data.cols);
3588+
CV_Assert(dst.rows <= evects.rows, dst.cols == data.cols);
35893589
n = dst.rows;
35903590
}
35913591
pca.eigenvectors = evects.rowRange(0, n);
@@ -3611,12 +3611,12 @@ cvBackProjectPCA( const CvArr* proj_arr, const CvArr* avg_arr,
36113611
int n;
36123612
if( mean.rows == 1 )
36133613
{
3614-
CV_Assert(data.cols <= evects.rows && dst.rows == data.rows);
3614+
CV_Assert(data.cols <= evects.rows, dst.rows == data.rows);
36153615
n = data.cols;
36163616
}
36173617
else
36183618
{
3619-
CV_Assert(data.rows <= evects.rows && dst.cols == data.cols);
3619+
CV_Assert(data.rows <= evects.rows, dst.cols == data.cols);
36203620
n = data.rows;
36213621
}
36223622
pca.eigenvectors = evects.rowRange(0, n);

0 commit comments

Comments
 (0)