generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

inserted missing std:: (ticket #333). Thanks to trisk for the patch!

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-07-29 10:55:09 +00:00
parent 97254a7b45
commit 0faa75da11
7 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cv/src/acameracalibration.cpp
View File

@@ -1610,9 +1610,9 @@ double CV_StereoCalibrationTest_C::calibrateStereoCamera( const vector<vector<Po
{
ni = (int)objectPoints[i].size();
((int*)npoints.data)[i] = ni;
copy(objectPoints[i].begin(), objectPoints[i].end(), objPtData + j);
copy(imagePoints1[i].begin(), imagePoints1[i].end(), imgPtData + j);
copy(imagePoints2[i].begin(), imagePoints2[i].end(), imgPtData2 + j);
std::copy(objectPoints[i].begin(), objectPoints[i].end(), objPtData + j);
std::copy(imagePoints1[i].begin(), imagePoints1[i].end(), imgPtData + j);
std::copy(imagePoints2[i].begin(), imagePoints2[i].end(), imgPtData2 + j);
}
CvMat _objPt = objPt, _imgPt = imgPt, _imgPt2 = imgPt2, _npoints = npoints;
CvMat _cameraMatrix1 = cameraMatrix1, _distCoeffs1 = distCoeffs1;

6
tests/cxcore/src/asolvepoly.cpp
View File

@@ -98,8 +98,8 @@ void CV_SolvePolyTest::run( int )
for (int j = 0; j < n; ++j)
ar[j] = complex_type(u[j * 2], u[j * 2 + 1]);
sort(r.begin(), r.end(), pred_complex());
sort(ar.begin(), ar.end(), pred_complex());
std::sort(r.begin(), r.end(), pred_complex());
std::sort(ar.begin(), ar.end(), pred_complex());
pass = true;
if( n == 3 )
@@ -114,7 +114,7 @@ void CV_SolvePolyTest::run( int )
nr2 = cv::solveCubic(cv::Mat_<float>(cv::Mat(&amat)), umat2);
cvFlip(&amat, &amat, 0);
if(nr2 > 0)
sort(ar2.begin(), ar2.begin()+nr2, pred_double());
std::sort(ar2.begin(), ar2.begin()+nr2, pred_double());
ar2.resize(nr2);
int nr1 = 0;

4
tests/cxts/cxts.cpp
View File

@@ -886,8 +886,8 @@ void CvTest::run( int start_from )
break;
}
sort(v_cpe.begin(), v_cpe.end());
sort(v_time.begin(), v_time.end());
std::sort(v_cpe.begin(), v_cpe.end());
std::sort(v_time.begin(), v_time.end());
t_cpu_acc = v_cpe[i/2];
t_acc = v_time[i/2];