potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #9457 from alalek:type_traits_issue_7599

Browse Source
This commit is contained in:
Maksim Shabunin
2017-09-06 13:34:28 +00:00
parent b05789ff0b 164a41b399
commit 2ac57a2b1f
23 changed files with 757 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/calib3d/test/test_cameracalibration.cpp
+3 -3
View File
@@ -1911,9 +1911,9 @@ double CV_StereoCalibrationTest_C::calibrateStereoCamera( const vector<vector<Po
}
Mat npoints( 1, nimages, CV_32S ),
objPt( 1, total, DataType<Point3f>::type ),
imgPt( 1, total, DataType<Point2f>::type ),
imgPt2( 1, total, DataType<Point2f>::type );
objPt( 1, total, traits::Type<Point3f>::value ),
imgPt( 1, total, traits::Type<Point2f>::value ),
imgPt2( 1, total, traits::Type<Point2f>::value );
Point2f* imgPtData2 = imgPt2.ptr<Point2f>();
Point3f* objPtData = objPt.ptr<Point3f>();