a few more warnings fixed

This commit is contained in:
Vadim Pisarevsky 2010-07-16 22:44:48 +00:00
parent 758e826d2e
commit 75cf8c1b47
4 changed files with 6 additions and 6 deletions

View File

@ -1053,7 +1053,7 @@ private:
/* filtering by geometric consistency */ /* filtering by geometric consistency */
for(int i = 0; i < matchesSize; ++i) for(int i = 0; i < matchesSize; ++i)
{ {
size_t consistNum = 1; int consistNum = 1;
float gc = float_max; float gc = float_max;
for(int j = 0; j < matchesSize; ++j) for(int j = 0; j < matchesSize; ++j)
@ -1140,14 +1140,14 @@ private:
} }
group_t allMatchesInds; group_t allMatchesInds;
for(size_t i = 0; i < matchesSize; ++i) for(int i = 0; i < matchesSize; ++i)
allMatchesInds.insert(i); allMatchesInds.insert(i);
vector<float> buf(matchesSize); vector<float> buf(matchesSize);
float *buf_beg = &buf[0]; float *buf_beg = &buf[0];
vector<group_t> groups; vector<group_t> groups;
for(size_t g = 0; g < matchesSize; ++g) for(int g = 0; g < matchesSize; ++g)
{ {
if (out) if (g % 100 == 0) *out << "G = " << g << endl; if (out) if (g % 100 == 0) *out << "G = " << g << endl;

View File

@ -1405,7 +1405,7 @@ void CV_StereoCalibrationTest::run( int )
Size imgsize; Size imgsize;
int total = 0; int total = 0;
for( size_t i = 0; i < nframes; i++ ) for( int i = 0; i < nframes; i++ )
{ {
Mat left = imread(imglist[i*2]); Mat left = imread(imglist[i*2]);
Mat right = imread(imglist[i*2+1]); Mat right = imread(imglist[i*2+1]);

View File

@ -322,7 +322,7 @@ bool CV_ChessboardDetectorTest::checkByGenerator()
const Size sizes[] = { Size(6, 6), Size(8, 6), Size(11, 12), Size(5, 4) }; const Size sizes[] = { Size(6, 6), Size(8, 6), Size(11, 12), Size(5, 4) };
const size_t sizes_num = sizeof(sizes)/sizeof(sizes[0]); const size_t sizes_num = sizeof(sizes)/sizeof(sizes[0]);
const size_t test_num = 16; const int test_num = 16;
int progress = 0; int progress = 0;
for(int i = 0; i < test_num; ++i) for(int i = 0; i < test_num; ++i)
{ {

View File

@ -66,7 +66,7 @@ void BruteForceMatcherTest::run( int )
ts->printf( CvTS::LOG, "Matching without matrix multiplication time s: %f, us per pair: %f\n", ts->printf( CvTS::LOG, "Matching without matrix multiplication time s: %f, us per pair: %f\n",
genericMatcherTime*1e-6, genericMatcherTime/( descriptorsNumber*descriptorsNumber ) ); genericMatcherTime*1e-6, genericMatcherTime/( descriptorsNumber*descriptorsNumber ) );
if( specMatches.size() != descriptorsNumber || genericMatches.size() != descriptorsNumber ) if( (int)specMatches.size() != descriptorsNumber || (int)genericMatches.size() != descriptorsNumber )
ts->set_failed_test_info( CvTS::FAIL_INVALID_OUTPUT ); ts->set_failed_test_info( CvTS::FAIL_INVALID_OUTPUT );
for( int i=0;i<descriptorsNumber;i++ ) for( int i=0;i<descriptorsNumber;i++ )
{ {