Skip to content

Commit a627737

Browse files
take1014take1014
authored
Merge pull request opencv#21107 from take1014:remove_assert_21038
resolves opencv#21038 * remove C assert * revert C header * fix several points in review * fix test_ds.cpp
1 parent b55d8f4 commit a627737

File tree

81 files changed

+277
-286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+277
-286
lines changed

‎modules/calib3d/src/calibration.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2125,7 +2125,7 @@ static double cvStereoCalibrateImpl( const CvMat* _objectPoints, const CvMat* _i
21252125
if( solver.state == CvLevMarq::CALC_J )
21262126
{
21272127
int iofs = (nimages+1)*6 + k*NINTRINSIC, eofs = (i+1)*6;
2128-
assert( JtJ && JtErr );
2128+
CV_Assert( JtJ && JtErr );
21292129

21302130
Mat _JtJ(cvarrToMat(JtJ)), _JtErr(cvarrToMat(JtErr));
21312131

@@ -2929,7 +2929,7 @@ cvRQDecomp3x3( const CvMat *matrixM, CvMat *matrixR, CvMat *matrixQ,
29292929
CvMat Qx = cvMat(3, 3, CV_64F, _Qx);
29302930

29312931
cvMatMul(&M, &Qx, &R);
2932-
assert(fabs(matR[2][1]) < FLT_EPSILON);
2932+
CV_DbgAssert(fabs(matR[2][1]) < FLT_EPSILON);
29332933
matR[2][1] = 0;
29342934

29352935
/* Find Givens rotation for y axis. */
@@ -2948,7 +2948,7 @@ cvRQDecomp3x3( const CvMat *matrixM, CvMat *matrixR, CvMat *matrixQ,
29482948
CvMat Qy = cvMat(3, 3, CV_64F, _Qy);
29492949
cvMatMul(&R, &Qy, &M);
29502950

2951-
assert(fabs(matM[2][0]) < FLT_EPSILON);
2951+
CV_DbgAssert(fabs(matM[2][0]) < FLT_EPSILON);
29522952
matM[2][0] = 0;
29532953

29542954
/* Find Givens rotation for z axis. */
@@ -2968,7 +2968,7 @@ cvRQDecomp3x3( const CvMat *matrixM, CvMat *matrixR, CvMat *matrixQ,
29682968
CvMat Qz = cvMat(3, 3, CV_64F, _Qz);
29692969

29702970
cvMatMul(&M, &Qz, &R);
2971-
assert(fabs(matR[1][0]) < FLT_EPSILON);
2971+
CV_DbgAssert(fabs(matR[1][0]) < FLT_EPSILON);
29722972
matR[1][0] = 0;
29732973

29742974
// Solve the decomposition ambiguity.

‎modules/calib3d/src/compat_ptsetreg.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ bool CvLevMarq::update( const CvMat*& _param, CvMat*& matJ, CvMat*& _err )
121121
{
122122
matJ = _err = 0;
123123

124-
assert( !err.empty() );
124+
CV_Assert( !err.empty() );
125125
if( state == DONE )
126126
{
127127
_param = param;
@@ -154,7 +154,7 @@ bool CvLevMarq::update( const CvMat*& _param, CvMat*& matJ, CvMat*& _err )
154154
return true;
155155
}
156156

157-
assert( state == CHECK_ERR );
157+
CV_Assert( state == CHECK_ERR );
158158
errNorm = cvNorm( err, 0, CV_L2 );
159159
if( errNorm > prevErrNorm )
160160
{
@@ -222,7 +222,7 @@ bool CvLevMarq::updateAlt( const CvMat*& _param, CvMat*& _JtJ, CvMat*& _JtErr, d
222222
return true;
223223
}
224224

225-
assert( state == CHECK_ERR );
225+
CV_Assert( state == CHECK_ERR );
226226
if( errNorm > prevErrNorm )
227227
{
228228
if( ++lambdaLg10 <= 16 )

‎modules/calib3d/test/test_cameracalibration.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -831,30 +831,30 @@ void CV_CameraCalibrationTest_CPP::calibrate(int imageCount, int* pointCounts,
831831
perViewErrorsMat,
832832
flags );
833833

834-
assert( stdDevsMatInt.type() == CV_64F );
835-
assert( stdDevsMatInt.total() == static_cast<size_t>(CV_CALIB_NINTRINSIC) );
834+
CV_Assert( stdDevsMatInt.type() == CV_64F );
835+
CV_Assert( stdDevsMatInt.total() == static_cast<size_t>(CV_CALIB_NINTRINSIC) );
836836
memcpy( stdDevs, stdDevsMatInt.ptr(), CV_CALIB_NINTRINSIC*sizeof(double) );
837837

838-
assert( stdDevsMatExt.type() == CV_64F );
839-
assert( stdDevsMatExt.total() == static_cast<size_t>(6*imageCount) );
838+
CV_Assert( stdDevsMatExt.type() == CV_64F );
839+
CV_Assert( stdDevsMatExt.total() == static_cast<size_t>(6*imageCount) );
840840
memcpy( stdDevs + CV_CALIB_NINTRINSIC, stdDevsMatExt.ptr(), 6*imageCount*sizeof(double) );
841841

842-
assert( perViewErrorsMat.type() == CV_64F);
843-
assert( perViewErrorsMat.total() == static_cast<size_t>(imageCount) );
842+
CV_Assert( perViewErrorsMat.type() == CV_64F);
843+
CV_Assert( perViewErrorsMat.total() == static_cast<size_t>(imageCount) );
844844
memcpy( perViewErrors, perViewErrorsMat.ptr(), imageCount*sizeof(double) );
845845

846-
assert( cameraMatrix.type() == CV_64FC1 );
846+
CV_Assert( cameraMatrix.type() == CV_64FC1 );
847847
memcpy( _cameraMatrix, cameraMatrix.ptr(), 9*sizeof(double) );
848848

849-
assert( cameraMatrix.type() == CV_64FC1 );
849+
CV_Assert( cameraMatrix.type() == CV_64FC1 );
850850
memcpy( _distortionCoeffs, distCoeffs.ptr(), 4*sizeof(double) );
851851

852852
vector<Mat>::iterator rvecsIt = rvecs.begin();
853853
vector<Mat>::iterator tvecsIt = tvecs.begin();
854854
double *rm = rotationMatrices,
855855
*tm = translationVectors;
856-
assert( rvecsIt->type() == CV_64FC1 );
857-
assert( tvecsIt->type() == CV_64FC1 );
856+
CV_Assert( rvecsIt->type() == CV_64FC1 );
857+
CV_Assert( tvecsIt->type() == CV_64FC1 );
858858
for( int i = 0; i < imageCount; ++rvecsIt, ++tvecsIt, i++, rm+=9, tm+=3 )
859859
{
860860
Mat r9( 3, 3, CV_64FC1 );
@@ -1141,7 +1141,7 @@ void CV_ProjectPointsTest::run(int)
11411141
imgPoints, dpdrot, dpdt, dpdf, dpdc, dpddist, 0 );
11421142

11431143
// calculate and check image points
1144-
assert( (int)imgPoints.size() == pointCount );
1144+
CV_Assert( (int)imgPoints.size() == pointCount );
11451145
vector<Point2f>::const_iterator it = imgPoints.begin();
11461146
for( int i = 0; i < pointCount; i++, ++it )
11471147
{

‎modules/calib3d/test/test_fundam.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static int cvTsRodrigues( const CvMat* src, CvMat* dst, CvMat* jacobian )
5656

5757
if( jacobian )
5858
{
59-
assert( (jacobian->rows == 9 && jacobian->cols == 3) ||
59+
CV_Assert( (jacobian->rows == 9 && jacobian->cols == 3) ||
6060
(jacobian->rows == 3 && jacobian->cols == 9) );
6161
}
6262

@@ -65,7 +65,7 @@ static int cvTsRodrigues( const CvMat* src, CvMat* dst, CvMat* jacobian )
6565
double r[3], theta;
6666
CvMat _r = cvMat( src->rows, src->cols, CV_MAKETYPE(CV_64F,CV_MAT_CN(src->type)), r);
6767

68-
assert( dst->rows == 3 && dst->cols == 3 );
68+
CV_Assert( dst->rows == 3 && dst->cols == 3 );
6969

7070
cvConvert( src, &_r );
7171

@@ -320,7 +320,7 @@ static int cvTsRodrigues( const CvMat* src, CvMat* dst, CvMat* jacobian )
320320
}
321321
else
322322
{
323-
assert(0);
323+
CV_Assert(0);
324324
return 0;
325325
}
326326

@@ -404,7 +404,7 @@ static void test_convertHomogeneous( const Mat& _src, Mat& _dst )
404404
}
405405
else
406406
{
407-
assert( count == dst.cols );
407+
CV_Assert( count == dst.cols );
408408
ddims = dst.channels()*dst.rows;
409409
if( dst.rows == 1 )
410410
{

‎modules/calib3d/test/test_stereomatching.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ void CV_StereoMatchingTest::run(int)
406406
{
407407
string dataPath = ts->get_data_path() + "cv/";
408408
string algorithmName = name;
409-
assert( !algorithmName.empty() );
409+
CV_Assert( !algorithmName.empty() );
410410
if( dataPath.empty() )
411411
{
412412
ts->printf( cvtest::TS::LOG, "dataPath is empty" );
@@ -553,22 +553,22 @@ int CV_StereoMatchingTest::processStereoMatchingResults( FileStorage& fs, int ca
553553
{
554554
// rightDisp is not used in current test virsion
555555
int code = cvtest::TS::OK;
556-
assert( fs.isOpened() );
557-
assert( trueLeftDisp.type() == CV_32FC1 );
558-
assert( trueRightDisp.empty() || trueRightDisp.type() == CV_32FC1 );
559-
assert( leftDisp.type() == CV_32FC1 && (rightDisp.empty() || rightDisp.type() == CV_32FC1) );
556+
CV_Assert( fs.isOpened() );
557+
CV_Assert( trueLeftDisp.type() == CV_32FC1 );
558+
CV_Assert( trueRightDisp.empty() || trueRightDisp.type() == CV_32FC1 );
559+
CV_Assert( leftDisp.type() == CV_32FC1 && (rightDisp.empty() || rightDisp.type() == CV_32FC1) );
560560

561561
// get masks for unknown ground truth disparity values
562562
Mat leftUnknMask, rightUnknMask;
563563
DatasetParams params = datasetsParams[caseDatasets[caseIdx]];
564564
absdiff( trueLeftDisp, Scalar(params.dispUnknVal), leftUnknMask );
565565
leftUnknMask = leftUnknMask < std::numeric_limits<float>::epsilon();
566-
assert(leftUnknMask.type() == CV_8UC1);
566+
CV_Assert(leftUnknMask.type() == CV_8UC1);
567567
if( !trueRightDisp.empty() )
568568
{
569569
absdiff( trueRightDisp, Scalar(params.dispUnknVal), rightUnknMask );
570570
rightUnknMask = rightUnknMask < std::numeric_limits<float>::epsilon();
571-
assert(rightUnknMask.type() == CV_8UC1);
571+
CV_Assert(rightUnknMask.type() == CV_8UC1);
572572
}
573573

574574
// calculate errors
@@ -623,7 +623,7 @@ int CV_StereoMatchingTest::readDatasetsParams( FileStorage& fs )
623623
}
624624
datasetsParams.clear();
625625
FileNode fn = fs.getFirstTopLevelNode();
626-
assert(fn.isSeq());
626+
CV_Assert(fn.isSeq());
627627
for( int i = 0; i < (int)fn.size(); i+=3 )
628628
{
629629
String _name = fn[i];
@@ -649,7 +649,7 @@ int CV_StereoMatchingTest::readRunParams( FileStorage& fs )
649649

650650
void CV_StereoMatchingTest::writeErrors( const string& errName, const vector<float>& errors, FileStorage* fs )
651651
{
652-
assert( (int)errors.size() == ERROR_KINDS_COUNT );
652+
CV_Assert( (int)errors.size() == ERROR_KINDS_COUNT );
653653
vector<float>::const_iterator it = errors.begin();
654654
if( fs )
655655
for( int i = 0; i < ERROR_KINDS_COUNT; i++, ++it )
@@ -696,9 +696,9 @@ void CV_StereoMatchingTest::readROI( FileNode& fn, Rect& validROI )
696696
int CV_StereoMatchingTest::compareErrors( const vector<float>& calcErrors, const vector<float>& validErrors,
697697
const vector<float>& eps, const string& errName )
698698
{
699-
assert( (int)calcErrors.size() == ERROR_KINDS_COUNT );
700-
assert( (int)validErrors.size() == ERROR_KINDS_COUNT );
701-
assert( (int)eps.size() == ERROR_KINDS_COUNT );
699+
CV_Assert( (int)calcErrors.size() == ERROR_KINDS_COUNT );
700+
CV_Assert( (int)validErrors.size() == ERROR_KINDS_COUNT );
701+
CV_Assert( (int)eps.size() == ERROR_KINDS_COUNT );
702702
vector<float>::const_iterator calcIt = calcErrors.begin(),
703703
validIt = validErrors.begin(),
704704
epsIt = eps.begin();
@@ -757,7 +757,7 @@ class CV_StereoBMTest : public CV_StereoMatchingTest
757757
{
758758
int code = CV_StereoMatchingTest::readRunParams( fs );
759759
FileNode fn = fs.getFirstTopLevelNode();
760-
assert(fn.isSeq());
760+
CV_Assert(fn.isSeq());
761761
for( int i = 0; i < (int)fn.size(); i+=5 )
762762
{
763763
String caseName = fn[i], datasetName = fn[i+1];
@@ -776,8 +776,8 @@ class CV_StereoBMTest : public CV_StereoMatchingTest
776776
Rect& calcROI, Mat& leftDisp, Mat& /*rightDisp*/, int caseIdx )
777777
{
778778
RunParams params = caseRunParams[caseIdx];
779-
assert( params.ndisp%16 == 0 );
780-
assert( _leftImg.type() == CV_8UC3 && _rightImg.type() == CV_8UC3 );
779+
CV_Assert( params.ndisp%16 == 0 );
780+
CV_Assert( _leftImg.type() == CV_8UC3 && _rightImg.type() == CV_8UC3 );
781781
Mat leftImg; cvtColor( _leftImg, leftImg, COLOR_BGR2GRAY );
782782
Mat rightImg; cvtColor( _rightImg, rightImg, COLOR_BGR2GRAY );
783783

@@ -883,7 +883,7 @@ class CV_StereoSGBMTest : public CV_StereoMatchingTest
883883
{
884884
int code = CV_StereoMatchingTest::readRunParams(fs);
885885
FileNode fn = fs.getFirstTopLevelNode();
886-
assert(fn.isSeq());
886+
CV_Assert(fn.isSeq());
887887
for( int i = 0; i < (int)fn.size(); i+=5 )
888888
{
889889
String caseName = fn[i], datasetName = fn[i+1];
@@ -902,7 +902,7 @@ class CV_StereoSGBMTest : public CV_StereoMatchingTest
902902
Rect& calcROI, Mat& leftDisp, Mat& /*rightDisp*/, int caseIdx )
903903
{
904904
RunParams params = caseRunParams[caseIdx];
905-
assert( params.ndisp%16 == 0 );
905+
CV_Assert( params.ndisp%16 == 0 );
906906
Ptr<StereoSGBM> sgbm = StereoSGBM::create( 0, params.ndisp, params.winSize,
907907
10*params.winSize*params.winSize,
908908
40*params.winSize*params.winSize,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ class WImage
236236
void operator=(const WImage&);
237237

238238
explicit WImage(IplImage* img) : image_(img) {
239-
assert(!img || img->depth == Depth());
239+
CV_Assert(!img || img->depth == Depth());
240240
}
241241

242242
void SetIpl(IplImage* image) {
243-
assert(!image || image->depth == Depth());
243+
CV_Assert(!image || image->depth == Depth());
244244
image_ = image;
245245
}
246246

@@ -260,7 +260,7 @@ class WImageC : public WImage<T>
260260
enum { kChannels = C };
261261

262262
explicit WImageC(IplImage* img) : WImage<T>(img) {
263-
assert(!img || img->nChannels == Channels());
263+
CV_Assert(!img || img->nChannels == Channels());
264264
}
265265

266266
// Construct a view into a region of this image
@@ -283,7 +283,7 @@ class WImageC : public WImage<T>
283283
void operator=(const WImageC&);
284284

285285
void SetIpl(IplImage* image) {
286-
assert(!image || image->depth == WImage<T>::Depth());
286+
CV_Assert(!image || image->depth == WImage<T>::Depth());
287287
WImage<T>::SetIpl(image);
288288
}
289289
};

‎modules/core/src/array.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ cvInitNArrayIterator( int count, CvArr** arrs,
497497
// returns zero value if iteration is finished, non-zero otherwise
498498
CV_IMPL int cvNextNArraySlice( CvNArrayIterator* iterator )
499499
{
500-
assert( iterator != 0 );
500+
CV_Assert( iterator != 0 );
501501
int i, dims;
502502

503503
for( dims = iterator->dims; dims > 0; dims-- )
@@ -648,7 +648,7 @@ icvGetNodePtr( CvSparseMat* mat, const int* idx, int* _type,
648648
int i, tabidx;
649649
unsigned hashval = 0;
650650
CvSparseNode *node;
651-
assert( CV_IS_SPARSE_MAT( mat ));
651+
CV_Assert( CV_IS_SPARSE_MAT( mat ));
652652

653653
if( !precalc_hashval )
654654
{
@@ -697,7 +697,7 @@ icvGetNodePtr( CvSparseMat* mat, const int* idx, int* _type,
697697
int newrawsize = newsize*sizeof(newtable[0]);
698698

699699
CvSparseMatIterator iterator;
700-
assert( (newsize & (newsize - 1)) == 0 );
700+
CV_Assert( (newsize & (newsize - 1)) == 0 );
701701

702702
// resize hash table
703703
newtable = (void**)cvAlloc( newrawsize );
@@ -742,7 +742,7 @@ icvDeleteNode( CvSparseMat* mat, const int* idx, unsigned* precalc_hashval )
742742
int i, tabidx;
743743
unsigned hashval = 0;
744744
CvSparseNode *node, *prev = 0;
745-
assert( CV_IS_SPARSE_MAT( mat ));
745+
CV_Assert( CV_IS_SPARSE_MAT( mat ));
746746

747747
if( !precalc_hashval )
748748
{
@@ -1462,7 +1462,7 @@ cvScalarToRawData( const CvScalar* scalar, void* data, int type, int extend_to_1
14621462
int cn = CV_MAT_CN( type );
14631463
int depth = type & CV_MAT_DEPTH_MASK;
14641464

1465-
assert( scalar && data );
1465+
CV_Assert( scalar && data );
14661466
if( (unsigned)(cn - 1) >= 4 )
14671467
CV_Error( CV_StsOutOfRange, "The number of channels must be 1, 2, 3 or 4" );
14681468

@@ -1509,7 +1509,7 @@ cvScalarToRawData( const CvScalar* scalar, void* data, int type, int extend_to_1
15091509
((double*)data)[cn] = (double)(scalar->val[cn]);
15101510
break;
15111511
default:
1512-
assert(0);
1512+
CV_Assert(0);
15131513
CV_Error( CV_BadDepth, "" );
15141514
}
15151515

@@ -1534,7 +1534,7 @@ cvRawDataToScalar( const void* data, int flags, CvScalar* scalar )
15341534
{
15351535
int cn = CV_MAT_CN( flags );
15361536

1537-
assert( scalar && data );
1537+
CV_Assert( scalar && data );
15381538

15391539
if( (unsigned)(cn - 1) >= 4 )
15401540
CV_Error( CV_StsOutOfRange, "The number of channels must be 1, 2, 3 or 4" );
@@ -1572,7 +1572,7 @@ cvRawDataToScalar( const void* data, int flags, CvScalar* scalar )
15721572
scalar->val[cn] = ((double*)data)[cn];
15731573
break;
15741574
default:
1575-
assert(0);
1575+
CV_Assert(0);
15761576
CV_Error( CV_BadDepth, "" );
15771577
}
15781578
}
@@ -2623,7 +2623,7 @@ cvReshapeMatND( const CvArr* arr,
26232623

26242624
{
26252625
CvMatND* mat = (CvMatND*)arr;
2626-
assert( new_cn > 0 );
2626+
CV_Assert( new_cn > 0 );
26272627
int last_dim_size = mat->dim[mat->dims-1].size*CV_MAT_CN(mat->type);
26282628
int new_size = last_dim_size/new_cn;
26292629

@@ -2901,7 +2901,7 @@ CV_IMPL IplImage *
29012901
cvCreateImage( CvSize size, int depth, int channels )
29022902
{
29032903
IplImage *img = cvCreateImageHeader( size, depth, channels );
2904-
assert( img );
2904+
CV_Assert( img );
29052905
cvCreateData( img );
29062906

29072907
return img;

0 commit comments

Comments
 (0)