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

updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-07-16 12:54:53 +00:00
parent 0c9eca7922
commit f78a3b4cc1
465 changed files with 51856 additions and 41344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cv/src/abundleadjustment.cpp
View File

@@ -401,13 +401,13 @@ public:
inline int NumCameras()
{
return m_cameras.size();
return (int)m_cameras.size();
}
inline int AddCamera(Camera* cam)
{
m_cameras.push_back(cam);
return m_cameras.size();
return (int)m_cameras.size();
}
RigidBody* GetBody()

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

@@ -961,7 +961,7 @@ void calcdfdx( const vector<vector<Point2f> >& leftF, const vector<vector<Point2
CV_Assert( !leftF.empty() && !rightF.empty() && !leftF[0].empty() && !rightF[0].empty() );
CV_Assert( leftF[0].size() == rightF[0].size() );
CV_Assert( fabs(eps) > std::numeric_limits<double>::epsilon() );
int fcount = leftF[0].size(), xdim = leftF.size();
int fcount = (int)leftF[0].size(), xdim = (int)leftF.size();
dfdx.create( fcount*fdim, xdim, CV_64FC1 );
@@ -1397,7 +1397,7 @@ void CV_StereoCalibrationTest::run( int )
return;
}
size_t nframes = imglist.size()/2;
int nframes = (int)(imglist.size()/2);
int npoints = patternSize.width*patternSize.height;
vector<vector<Point3f> > objpt(nframes);
vector<vector<Point2f> > imgpt1(nframes);
@@ -1426,7 +1426,7 @@ void CV_StereoCalibrationTest::run( int )
ts->set_failed_test_info( CvTS::FAIL_INVALID_OUTPUT );
return;
}
total += imgpt1[i].size();
total += (int)imgpt1[i].size();
for( int j = 0; j < npoints; j++ )
objpt[i].push_back(Point3f((float)(j%patternSize.width), (float)(j/patternSize.width), 0.f));
}
@@ -1514,7 +1514,7 @@ void CV_StereoCalibrationTest::run( int )
bool verticalStereo = abs(P2.at<double>(0,3)) < abs(P2.at<double>(1,3));
double maxDiff_c = 0, maxDiff_uc = 0;
for( size_t i = 0, k = 0; i < nframes; i++ )
for( int i = 0, k = 0; i < nframes; i++ )
{
vector<Point2f> temp[2];
undistortPoints(Mat(imgpt1[i]), temp[0], M1, D1, R1, P1);
@@ -1592,10 +1592,10 @@ double CV_StereoCalibrationTest_C::calibrateStereoCamera( const vector<vector<Po
E.create(3, 3, CV_64F);
F.create(3, 3, CV_64F);
int nimages = objectPoints.size(), total = 0;
for( int i = 0; i < (int)objectPoints.size(); i++ )
int nimages = (int)objectPoints.size(), total = 0;
for( int i = 0; i < nimages; i++ )
{
total += objectPoints[i].size();
total += (int)objectPoints[i].size();
}
Mat npoints( 1, nimages, CV_32S ),
@@ -1608,7 +1608,7 @@ double CV_StereoCalibrationTest_C::calibrateStereoCamera( const vector<vector<Po
Point2f* imgPtData = imgPt.ptr<Point2f>();
for( int i = 0, ni = 0, j = 0; i < nimages; i++, j += ni )
{
ni = objectPoints[i].size();
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);

4
tests/cv/src/acameracalibration_artificial.cpp
View File

@@ -90,7 +90,7 @@ public:
}
~CV_CalibrateCameraArtificialTest() {}
protected:
size_t r;
int r;
const static int JUST_FIND_CORNERS = 0;
const static int USE_CORNERS_SUBPIX = 1;
@@ -370,7 +370,7 @@ protected:
RNG& rng = theRNG();
int progress = 0;
size_t repeat_num = 3;
int repeat_num = 3;
for(r = 0; r < repeat_num; ++r)
{
const int brds_num = 20;

10
tests/cv/src/achesscorners.cpp
View File

@@ -67,7 +67,7 @@ void show_points( const Mat& gray, const Mat& u, const vector<Point2f>& v, Size
}
if (!v.empty())
{
Mat corners(v.size(), 1, CV_32FC2, (void*)&v[0]);
Mat corners((int)v.size(), 1, CV_32FC2, (void*)&v[0]);
drawChessboardCorners( rgb, pattern_size, corners, was_found );
}
//namedWindow( "test", 0 ); imshow( "test", rgb ); waitKey(0);
@@ -92,14 +92,14 @@ CV_ChessboardDetectorTest::CV_ChessboardDetectorTest():
double calcError(const vector<Point2f>& v, const Mat& u)
{
size_t count_exp = static_cast<size_t>(u.cols * u.rows);
int count_exp = u.cols * u.rows;
const Point2f* u_data = u.ptr<Point2f>();
double err = numeric_limits<double>::max();
for( size_t k = 0; k < 2; ++k )
for( int k = 0; k < 2; ++k )
{
double err1 = 0;
for(size_t j = 0; j < count_exp; ++j )
for( int j = 0; j < count_exp; ++j )
{
int j1 = k == 0 ? j : count_exp - j - 1;
double dx = fabs( v[j].x - u_data[j1].x );
@@ -324,7 +324,7 @@ bool CV_ChessboardDetectorTest::checkByGenerator()
const size_t sizes_num = sizeof(sizes)/sizeof(sizes[0]);
const size_t test_num = 16;
int progress = 0;
for(size_t i = 0; i < test_num; ++i)
for(int i = 0; i < test_num; ++i)
{
progress = update_progress( progress, i, test_num, 0 );
ChessBoardGenerator cbg(sizes[i % sizes_num]);

8
tests/cv/src/acomposeRT.cpp
View File

@@ -58,7 +58,7 @@ public:
{
dr3_dr1.create(3, 3); dt3_dr1.create(3, 3);
for(size_t i = 0; i < 3; ++i)
for(int i = 0; i < 3; ++i)
{
ev.setTo(Scalar(0)); ev(i, 0) = eps;
@@ -75,7 +75,7 @@ public:
{
dr3_dr2.create(3, 3); dt3_dr2.create(3, 3);
for(size_t i = 0; i < 3; ++i)
for(int i = 0; i < 3; ++i)
{
ev.setTo(Scalar(0)); ev(i, 0) = eps;
@@ -92,7 +92,7 @@ public:
{
drt3_dt1.create(3, 3); dt3_dt1.create(3, 3);
for(size_t i = 0; i < 3; ++i)
for(int i = 0; i < 3; ++i)
{
ev.setTo(Scalar(0)); ev(i, 0) = eps;
@@ -109,7 +109,7 @@ public:
{
dr3_dt2.create(3, 3); dt3_dt2.create(3, 3);
for(size_t i = 0; i < 3; ++i)
for(int i = 0; i < 3; ++i)
{
ev.setTo(Scalar(0)); ev(i, 0) = eps;

4
tests/cv/src/acornerssubpix.cpp
View File

@@ -75,7 +75,7 @@ int calcDistance(const vector<Point2f>& set1, const vector<Point2f>& set2, doubl
double min_dist = std::numeric_limits<double>::max();
int min_idx = -1;
for(size_t j = 0; j < set2.size(); j++)
for(int j = 0; j < (int)set2.size(); j++)
{
double dist = norm(set1[i] - set2[j]);
if(dist < min_dist)
@@ -185,7 +185,7 @@ void CV_ChessboardSubpixelTest::run( int )
IplImage chessboard_image_header = chessboard_image;
cvFindCornerSubPix(&chessboard_image_header, (CvPoint2D32f*)&test_corners[0],
test_corners.size(), cvSize(3, 3), cvSize(1, 1), cvTermCriteria(CV_TERMCRIT_EPS|CV_TERMCRIT_ITER,300,0.1));
(int)test_corners.size(), cvSize(3, 3), cvSize(1, 1), cvTermCriteria(CV_TERMCRIT_EPS|CV_TERMCRIT_ITER,300,0.1));
find4QuadCornerSubpix(chessboard_image, test_corners, Size(5, 5));
double dist2 = 0.0;

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

@@ -101,12 +101,12 @@ protected:
{
double tmp, sum = 0;
double nsum = 0;
for(size_t i = 0; i < 3; ++i)
for(int i = 0; i < 3; ++i)
{
tmp = static_cast<double>(v1[i]);
tmp = v1[i];
nsum += tmp * tmp;
tmp = tmp - static_cast<double>(v2[i]);
tmp = tmp - v2[i];
sum += tmp * tmp;
}

2
tests/cv/src/astereomatching.cpp
View File

@@ -438,7 +438,7 @@ void CV_StereoMatchingTest::run(int)
resFS << "stereo_matching" << "{";
}
int progress = 0, caseCount = caseNames.size();
int progress = 0, caseCount = (int)caseNames.size();
for( int ci = 0; ci < caseCount; ci++)
{
progress = update_progress( progress, ci, caseCount, 0 );

2
tests/cv/src/bchesscorners.cpp
View File

@@ -83,7 +83,7 @@ protected:
cvFindChessboardCorners( &arr, pattern_size, out_corners, out_corner_count, flags );
else
cvDrawChessboardCorners( &drawCorImg, pattern_size,
(CvPoint2D32f*)&corners[0], corners.size(), was_found);
(CvPoint2D32f*)&corners[0], (int)corners.size(), was_found);
}
};

4
tests/cv/src/fast.cpp
View File

@@ -94,8 +94,8 @@ void CV_FastTest::run( int )
cv::circle(image2, kp.pt, cvRound(kp.size/2), CV_RGB(255, 0, 0));
}
Mat kps1(1, keypoints1.size() * sizeof(KeyPoint), CV_8U, &keypoints1[0]);
Mat kps2(1, keypoints2.size() * sizeof(KeyPoint), CV_8U, &keypoints2[0]);
Mat kps1(1, (int)(keypoints1.size() * sizeof(KeyPoint)), CV_8U, &keypoints1[0]);
Mat kps2(1, (int)(keypoints2.size() * sizeof(KeyPoint)), CV_8U, &keypoints2[0]);
FileStorage fs(xml, FileStorage::READ);
if (!fs.isOpened())

2
tests/cv/src/watershed.cpp
View File

@@ -91,7 +91,7 @@ void CV_WatershedTest::run( int /* start_from */)
colors.push_back(exp.ptr(p->y)[p->x] - 1);
}
fs.release();
const int compNum = colors.size() - 1;
const int compNum = (int)(colors.size() - 1);
watershed(orig, markers);

4
tests/cxcore/src/aarray.cpp
View File

@@ -279,7 +279,7 @@ void CV_ArrayOpTest::run( int /* start_from */)
M.copyTo(Md);
SparseMat M3; SparseMat(Md).convertTo(M3, Md.type(), 2);
int nz1 = M.nzcount(), nz2 = M3.nzcount();
int nz1 = (int)M.nzcount(), nz2 = (int)M3.nzcount();
double norm0 = norm(M, CV_C);
double norm1 = norm(M, CV_L1);
double norm2 = norm(M, CV_L2);
@@ -360,7 +360,7 @@ void CV_ArrayOpTest::run( int /* start_from */)
}
}
int nz = M.nzcount();
int nz = (int)M.nzcount();
if( nz != 0 )
{
errcount++;

4
tests/cxcore/src/aio.cpp
View File

@@ -176,8 +176,8 @@ void CV_IOTest::run( int )
multiply(test_mat, test_mat_scale, test_mat);
}
CvSeq* seq = cvCreateSeq(test_mat.type(), sizeof(CvSeq),
test_mat.elemSize(), storage);
CvSeq* seq = cvCreateSeq(test_mat.type(), (int)sizeof(CvSeq),
(int)test_mat.elemSize(), storage);
cvSeqPushMulti(seq, test_mat.data, test_mat.cols*test_mat.rows);
CvGraph* graph = cvCreateGraph( CV_ORIENTED_GRAPH,