Skip to content

Commit 8a3c394

Browse files
alalekalalek
committed
don't use constructors for C API structures
1 parent ad146e5 commit 8a3c394

70 files changed

Lines changed: 547 additions & 578 deletions

Some content is hidden

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

‎apps/traincascade/boost.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ void CvCascadeBoostTrainData::setData( const CvFeatureEvaluator* _featureEvaluat
543543
featureEvaluator = _featureEvaluator;
544544

545545
max_c_count = MAX( 2, featureEvaluator->getMaxCatCount() );
546-
_resp = featureEvaluator->getCls();
546+
_resp = cvMat(featureEvaluator->getCls());
547547
responses = &_resp;
548548
// TODO: check responses: elements must be 0 or 1
549549

‎apps/traincascade/old_ml_boost.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2122,12 +2122,12 @@ CvBoost::train( const Mat& _train_data, int _tflag,
21222122
const Mat& _missing_mask,
21232123
CvBoostParams _params, bool _update )
21242124
{
2125-
train_data_hdr = _train_data;
2125+
train_data_hdr = cvMat(_train_data);
21262126
train_data_mat = _train_data;
2127-
responses_hdr = _responses;
2127+
responses_hdr = cvMat(_responses);
21282128
responses_mat = _responses;
21292129

2130-
CvMat vidx = _var_idx, sidx = _sample_idx, vtype = _var_type, mmask = _missing_mask;
2130+
CvMat vidx = cvMat(_var_idx), sidx = cvMat(_sample_idx), vtype = cvMat(_var_type), mmask = cvMat(_missing_mask);
21312131

21322132
return train(&train_data_hdr, _tflag, &responses_hdr, vidx.data.ptr ? &vidx : 0,
21332133
sidx.data.ptr ? &sidx : 0, vtype.data.ptr ? &vtype : 0,
@@ -2138,7 +2138,7 @@ float
21382138
CvBoost::predict( const Mat& _sample, const Mat& _missing,
21392139
const Range& slice, bool raw_mode, bool return_sum ) const
21402140
{
2141-
CvMat sample = _sample, mmask = _missing;
2141+
CvMat sample = cvMat(_sample), mmask = cvMat(_missing);
21422142
/*if( weak_responses )
21432143
{
21442144
int weak_count = cvSliceLength( slice, weak );

‎apps/traincascade/old_ml_tree.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,12 +1592,12 @@ bool CvDTree::train( const Mat& _train_data, int _tflag,
15921592
const Mat& _sample_idx, const Mat& _var_type,
15931593
const Mat& _missing_mask, CvDTreeParams _params )
15941594
{
1595-
train_data_hdr = _train_data;
1595+
train_data_hdr = cvMat(_train_data);
15961596
train_data_mat = _train_data;
1597-
responses_hdr = _responses;
1597+
responses_hdr = cvMat(_responses);
15981598
responses_mat = _responses;
15991599

1600-
CvMat vidx=_var_idx, sidx=_sample_idx, vtype=_var_type, mmask=_missing_mask;
1600+
CvMat vidx=cvMat(_var_idx), sidx=cvMat(_sample_idx), vtype=cvMat(_var_type), mmask=cvMat(_missing_mask);
16011601

16021602
return train(&train_data_hdr, _tflag, &responses_hdr, vidx.data.ptr ? &vidx : 0, sidx.data.ptr ? &sidx : 0,
16031603
vtype.data.ptr ? &vtype : 0, mmask.data.ptr ? &mmask : 0, _params);
@@ -3734,7 +3734,7 @@ CvDTreeNode* CvDTree::predict( const CvMat* _sample,
37343734

37353735
CvDTreeNode* CvDTree::predict( const Mat& _sample, const Mat& _missing, bool preprocessed_input ) const
37363736
{
3737-
CvMat sample = _sample, mmask = _missing;
3737+
CvMat sample = cvMat(_sample), mmask = cvMat(_missing);
37383738
return predict(&sample, mmask.data.ptr ? &mmask : 0, preprocessed_input);
37393739
}
37403740

‎modules/calib3d/src/calibration.cpp‎

Lines changed: 106 additions & 94 deletions
Large diffs are not rendered by default.

‎modules/calib3d/src/compat_stereo.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ void cvFindStereoCorrespondenceBM( const CvArr* leftarr, const CvArr* rightarr,
111111
CvRect cvGetValidDisparityROI( CvRect roi1, CvRect roi2, int minDisparity,
112112
int numberOfDisparities, int SADWindowSize )
113113
{
114-
return (CvRect)cv::getValidDisparityROI( roi1, roi2, minDisparity,
115-
numberOfDisparities, SADWindowSize );
114+
return cvRect(cv::getValidDisparityROI( roi1, roi2, minDisparity,
115+
numberOfDisparities, SADWindowSize));
116116
}
117117

118118
void cvValidateDisparity( CvArr* _disp, const CvArr* _cost, int minDisparity,

‎modules/calib3d/src/solvepnp.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ bool solvePnP( InputArray _opoints, InputArray _ipoints,
134134
}
135135
else if (flags == SOLVEPNP_ITERATIVE)
136136
{
137-
CvMat c_objectPoints = opoints, c_imagePoints = ipoints;
138-
CvMat c_cameraMatrix = cameraMatrix, c_distCoeffs = distCoeffs;
139-
CvMat c_rvec = rvec, c_tvec = tvec;
137+
CvMat c_objectPoints = cvMat(opoints), c_imagePoints = cvMat(ipoints);
138+
CvMat c_cameraMatrix = cvMat(cameraMatrix), c_distCoeffs = cvMat(distCoeffs);
139+
CvMat c_rvec = cvMat(rvec), c_tvec = cvMat(tvec);
140140
cvFindExtrinsicCameraParams2(&c_objectPoints, &c_imagePoints, &c_cameraMatrix,
141141
(c_distCoeffs.rows && c_distCoeffs.cols) ? &c_distCoeffs : 0,
142142
&c_rvec, &c_tvec, useExtrinsicGuess );

‎modules/calib3d/src/triangulate.cpp‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,12 @@ void cv::triangulatePoints( InputArray _projMatr1, InputArray _projMatr2,
358358
if((points2.rows == 1 || points2.cols == 1) && points2.channels() == 2)
359359
points2 = points2.reshape(1, static_cast<int>(points2.total())).t();
360360

361-
CvMat cvMatr1 = matr1, cvMatr2 = matr2;
362-
CvMat cvPoints1 = points1, cvPoints2 = points2;
361+
CvMat cvMatr1 = cvMat(matr1), cvMatr2 = cvMat(matr2);
362+
CvMat cvPoints1 = cvMat(points1), cvPoints2 = cvMat(points2);
363363

364364
_points4D.create(4, points1.cols, points1.type());
365-
CvMat cvPoints4D = _points4D.getMat();
365+
Mat cvPoints4D_ = _points4D.getMat();
366+
CvMat cvPoints4D = cvMat(cvPoints4D_);
366367

367368
cvTriangulatePoints(&cvMatr1, &cvMatr2, &cvPoints1, &cvPoints2, &cvPoints4D);
368369
}
@@ -375,12 +376,13 @@ void cv::correctMatches( InputArray _F, InputArray _points1, InputArray _points2
375376
Mat F = _F.getMat();
376377
Mat points1 = _points1.getMat(), points2 = _points2.getMat();
377378

378-
CvMat cvPoints1 = points1, cvPoints2 = points2;
379-
CvMat cvF = F;
379+
CvMat cvPoints1 = cvMat(points1), cvPoints2 = cvMat(points2);
380+
CvMat cvF = cvMat(F);
380381

381382
_newPoints1.create(points1.size(), points1.type());
382383
_newPoints2.create(points2.size(), points2.type());
383-
CvMat cvNewPoints1 = _newPoints1.getMat(), cvNewPoints2 = _newPoints2.getMat();
384+
Mat cvNewPoints1_ = _newPoints1.getMat(), cvNewPoints2_ = _newPoints2.getMat();
385+
CvMat cvNewPoints1 = cvMat(cvNewPoints1_), cvNewPoints2 = cvMat(cvNewPoints2_);
384386

385387
cvCorrectMatches(&cvF, &cvPoints1, &cvPoints2, &cvNewPoints1, &cvNewPoints2);
386388
}

‎modules/calib3d/test/test_cameracalibration.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ void CV_CameraCalibrationTest::run( int start_from )
290290
cv::String filepath;
291291
cv::String filename;
292292

293-
CvSize imageSize;
294-
CvSize etalonSize;
293+
Size imageSize;
294+
Size etalonSize;
295295
int numImages;
296296

297297
CvPoint2D64f* imagePoints;
@@ -531,7 +531,7 @@ void CV_CameraCalibrationTest::run( int start_from )
531531
/* Now we can calibrate camera */
532532
calibrate( numImages,
533533
numbers,
534-
imageSize,
534+
cvSize(imageSize),
535535
imagePoints,
536536
objectPoints,
537537
distortion,
@@ -1009,9 +1009,9 @@ void CV_CalibrationMatrixValuesTest_C::calibMatrixValues( const Mat& _cameraMatr
10091009
double& fovx, double& fovy, double& focalLength,
10101010
Point2d& principalPoint, double& aspectRatio )
10111011
{
1012-
CvMat cameraMatrix = _cameraMatrix;
1013-
CvPoint2D64f pp;
1014-
cvCalibrationMatrixValues( &cameraMatrix, imageSize, apertureWidth, apertureHeight,
1012+
CvMat cameraMatrix = cvMat(_cameraMatrix);
1013+
CvPoint2D64f pp = {0, 0};
1014+
cvCalibrationMatrixValues( &cameraMatrix, cvSize(imageSize), apertureWidth, apertureHeight,
10151015
&fovx, &fovy, &focalLength, &pp, &aspectRatio );
10161016
principalPoint.x = pp.x;
10171017
principalPoint.y = pp.y;
@@ -1305,9 +1305,9 @@ void CV_ProjectPointsTest_C::project( const Mat& opoints, const Mat& rvec, const
13051305
dpdc.create(npoints*2, 2, CV_64F);
13061306
dpddist.create(npoints*2, distCoeffs.rows + distCoeffs.cols - 1, CV_64F);
13071307
Mat imagePoints(ipoints);
1308-
CvMat _objectPoints = opoints, _imagePoints = imagePoints;
1309-
CvMat _rvec = rvec, _tvec = tvec, _cameraMatrix = cameraMatrix, _distCoeffs = distCoeffs;
1310-
CvMat _dpdrot = dpdrot, _dpdt = dpdt, _dpdf = dpdf, _dpdc = dpdc, _dpddist = dpddist;
1308+
CvMat _objectPoints = cvMat(opoints), _imagePoints = cvMat(imagePoints);
1309+
CvMat _rvec = cvMat(rvec), _tvec = cvMat(tvec), _cameraMatrix = cvMat(cameraMatrix), _distCoeffs = cvMat(distCoeffs);
1310+
CvMat _dpdrot = cvMat(dpdrot), _dpdt = cvMat(dpdt), _dpdf = cvMat(dpdf), _dpdc = cvMat(dpdc), _dpddist = cvMat(dpddist);
13111311

13121312
cvProjectPoints2( &_objectPoints, &_rvec, &_tvec, &_cameraMatrix, &_distCoeffs,
13131313
&_imagePoints, &_dpdrot, &_dpdt, &_dpdf, &_dpdc, &_dpddist, aspectRatio );
@@ -1925,14 +1925,14 @@ double CV_StereoCalibrationTest_C::calibrateStereoCamera( const vector<vector<Po
19251925
std::copy(imagePoints1[i].begin(), imagePoints1[i].end(), imgPtData + j);
19261926
std::copy(imagePoints2[i].begin(), imagePoints2[i].end(), imgPtData2 + j);
19271927
}
1928-
CvMat _objPt = objPt, _imgPt = imgPt, _imgPt2 = imgPt2, _npoints = npoints;
1929-
CvMat _cameraMatrix1 = cameraMatrix1, _distCoeffs1 = distCoeffs1;
1930-
CvMat _cameraMatrix2 = cameraMatrix2, _distCoeffs2 = distCoeffs2;
1931-
CvMat matR = R, matT = T, matE = E, matF = F;
1928+
CvMat _objPt = cvMat(objPt), _imgPt = cvMat(imgPt), _imgPt2 = cvMat(imgPt2), _npoints = cvMat(npoints);
1929+
CvMat _cameraMatrix1 = cvMat(cameraMatrix1), _distCoeffs1 = cvMat(distCoeffs1);
1930+
CvMat _cameraMatrix2 = cvMat(cameraMatrix2), _distCoeffs2 = cvMat(distCoeffs2);
1931+
CvMat matR = cvMat(R), matT = cvMat(T), matE = cvMat(E), matF = cvMat(F);
19321932

19331933
return cvStereoCalibrate(&_objPt, &_imgPt, &_imgPt2, &_npoints, &_cameraMatrix1,
1934-
&_distCoeffs1, &_cameraMatrix2, &_distCoeffs2, imageSize,
1935-
&matR, &matT, &matE, &matF, flags, criteria );
1934+
&_distCoeffs1, &_cameraMatrix2, &_distCoeffs2, cvSize(imageSize),
1935+
&matR, &matT, &matE, &matF, flags, cvTermCriteria(criteria));
19361936
}
19371937

19381938
void CV_StereoCalibrationTest_C::rectify( const Mat& cameraMatrix1, const Mat& distCoeffs1,
@@ -1948,43 +1948,43 @@ void CV_StereoCalibrationTest_C::rectify( const Mat& cameraMatrix1, const Mat& d
19481948
P1.create(3, 4, rtype);
19491949
P2.create(3, 4, rtype);
19501950
Q.create(4, 4, rtype);
1951-
CvMat _cameraMatrix1 = cameraMatrix1, _distCoeffs1 = distCoeffs1;
1952-
CvMat _cameraMatrix2 = cameraMatrix2, _distCoeffs2 = distCoeffs2;
1953-
CvMat matR = R, matT = T, _R1 = R1, _R2 = R2, _P1 = P1, _P2 = P2, matQ = Q;
1951+
CvMat _cameraMatrix1 = cvMat(cameraMatrix1), _distCoeffs1 = cvMat(distCoeffs1);
1952+
CvMat _cameraMatrix2 = cvMat(cameraMatrix2), _distCoeffs2 = cvMat(distCoeffs2);
1953+
CvMat matR = cvMat(R), matT = cvMat(T), _R1 = cvMat(R1), _R2 = cvMat(R2), _P1 = cvMat(P1), _P2 = cvMat(P2), matQ = cvMat(Q);
19541954
cvStereoRectify( &_cameraMatrix1, &_cameraMatrix2, &_distCoeffs1, &_distCoeffs2,
1955-
imageSize, &matR, &matT, &_R1, &_R2, &_P1, &_P2, &matQ, flags,
1956-
alpha, newImageSize, (CvRect*)validPixROI1, (CvRect*)validPixROI2);
1955+
cvSize(imageSize), &matR, &matT, &_R1, &_R2, &_P1, &_P2, &matQ, flags,
1956+
alpha, cvSize(newImageSize), (CvRect*)validPixROI1, (CvRect*)validPixROI2);
19571957
}
19581958

19591959
bool CV_StereoCalibrationTest_C::rectifyUncalibrated( const Mat& points1,
19601960
const Mat& points2, const Mat& F, Size imgSize, Mat& H1, Mat& H2, double threshold )
19611961
{
19621962
H1.create(3, 3, CV_64F);
19631963
H2.create(3, 3, CV_64F);
1964-
CvMat _pt1 = points1, _pt2 = points2, matF, *pF=0, _H1 = H1, _H2 = H2;
1964+
CvMat _pt1 = cvMat(points1), _pt2 = cvMat(points2), matF, *pF=0, _H1 = cvMat(H1), _H2 = cvMat(H2);
19651965
if( F.size() == Size(3, 3) )
1966-
pF = &(matF = F);
1967-
return cvStereoRectifyUncalibrated(&_pt1, &_pt2, pF, imgSize, &_H1, &_H2, threshold) > 0;
1966+
pF = &(matF = cvMat(F));
1967+
return cvStereoRectifyUncalibrated(&_pt1, &_pt2, pF, cvSize(imgSize), &_H1, &_H2, threshold) > 0;
19681968
}
19691969

19701970
void CV_StereoCalibrationTest_C::triangulate( const Mat& P1, const Mat& P2,
19711971
const Mat &points1, const Mat &points2,
19721972
Mat &points4D )
19731973
{
1974-
CvMat _P1 = P1, _P2 = P2, _points1 = points1, _points2 = points2;
1974+
CvMat _P1 = cvMat(P1), _P2 = cvMat(P2), _points1 = cvMat(points1), _points2 = cvMat(points2);
19751975
points4D.create(4, points1.cols, points1.type());
1976-
CvMat _points4D = points4D;
1976+
CvMat _points4D = cvMat(points4D);
19771977
cvTriangulatePoints(&_P1, &_P2, &_points1, &_points2, &_points4D);
19781978
}
19791979

19801980
void CV_StereoCalibrationTest_C::correct( const Mat& F,
19811981
const Mat &points1, const Mat &points2,
19821982
Mat &newPoints1, Mat &newPoints2 )
19831983
{
1984-
CvMat _F = F, _points1 = points1, _points2 = points2;
1984+
CvMat _F = cvMat(F), _points1 = cvMat(points1), _points2 = cvMat(points2);
19851985
newPoints1.create(1, points1.cols, points1.type());
19861986
newPoints2.create(1, points2.cols, points2.type());
1987-
CvMat _newPoints1 = newPoints1, _newPoints2 = newPoints2;
1987+
CvMat _newPoints1 = cvMat(newPoints1), _newPoints2 = cvMat(newPoints2);
19881988
cvCorrectMatches(&_F, &_points1, &_points2, &_newPoints1, &_newPoints2);
19891989
}
19901990

0 commit comments

Comments
 (0)