mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed warnings of gcc

Browse Source
This commit is contained in:
Maria Dimashova 2010-11-26 12:15:08 +00:00
parent 5eae542769
commit 5802ea39b1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/features2d/src/calonder.cpp
View File

@ -969,8 +969,8 @@ float RTreeClassifier::countZeroElements()
num_elem = trees_.size()*trees_[0].num_leaves_*num_elem; num_elem = trees_.size()*trees_[0].num_leaves_*num_elem;
float flt_perc = 100.f*flt_zeros/num_elem; float flt_perc = 100.f*flt_zeros/num_elem;
float ui8_perc = 100.f*ui8_zeros/num_elem; float ui8_perc = 100.f*ui8_zeros/num_elem;
printf("[OK] RTC: overall %i/%i (%.3f%%) zeros in float leaves\n", flt_zeros, num_elem, flt_perc); printf("[OK] RTC: overall %i/%i (%.3f%%) zeros in float leaves\n", (int)flt_zeros, (int)num_elem, flt_perc);
printf(" overall %i/%i (%.3f%%) zeros in uint8 leaves\n", ui8_zeros, num_elem, ui8_perc); printf(" overall %i/%i (%.3f%%) zeros in uint8 leaves\n", (int)ui8_zeros, (int)num_elem, ui8_perc);
return flt_perc; return flt_perc;
} }

11
tests/cv/src/afeatures2d.cpp
View File

@ -133,7 +133,7 @@ void CV_FeatureDetectorTest::compareKeypointSets( const vector<KeyPoint>& validK
float countRatio = (float)validKeypoints.size() / (float)calcKeypoints.size(); float countRatio = (float)validKeypoints.size() / (float)calcKeypoints.size();
if( countRatio < 1 - maxCountRatioDif || countRatio > 1.f + maxCountRatioDif ) if( countRatio < 1 - maxCountRatioDif || countRatio > 1.f + maxCountRatioDif )
{ {
ts->printf( CvTS::LOG, "Bad keypoints count ratio (validCount = %d, calcCount = %d)!\n", ts->printf( CvTS::LOG, "Bad keypoints count ratio (validCount = %d, calcCount = %d).\n",
validKeypoints.size(), calcKeypoints.size() ); validKeypoints.size(), calcKeypoints.size() );
ts->set_failed_test_info( CvTS::FAIL_INVALID_OUTPUT ); ts->set_failed_test_info( CvTS::FAIL_INVALID_OUTPUT );
return; return;
@ -296,7 +296,6 @@ public:
maxDistDif(_maxDistDif), prevTime(_prevTime), dextractor(_dextractor), distance(d) {} maxDistDif(_maxDistDif), prevTime(_prevTime), dextractor(_dextractor), distance(d) {}
protected: protected:
virtual void createDescriptorExtractor() {} virtual void createDescriptorExtractor() {}
CV_DescriptorExtractorTest& operator=(const CV_DescriptorExtractorTest&) {}
void compareDescriptors( const Mat& validDescriptors, const Mat& calcDescriptors ) void compareDescriptors( const Mat& validDescriptors, const Mat& calcDescriptors )
{ {
@ -482,6 +481,9 @@ protected:
Ptr<DescriptorExtractor> dextractor; Ptr<DescriptorExtractor> dextractor;
Distance distance; Distance distance;
private:
CV_DescriptorExtractorTest& operator=(const CV_DescriptorExtractorTest&) { return *this; }
}; };
template<typename T, typename Distance> template<typename T, typename Distance>
@ -512,11 +514,10 @@ public:
{} {}
protected: protected:
static const int dim = 500; static const int dim = 500;
static const int queryDescCount = 300; // must be even number because we split train data in same cases in two static const int queryDescCount = 300; // must be even number because we split train data in some cases in two
static const int countFactor = 4; // do not change it static const int countFactor = 4; // do not change it
const float badPart; const float badPart;
CV_DescriptorMatcherTest& operator=(const CV_DescriptorMatcherTest&) {}
virtual void run( int ); virtual void run( int );
void generateData( Mat& query, Mat& train ); void generateData( Mat& query, Mat& train );
@ -526,6 +527,8 @@ protected:
void radiusMatchTest( const Mat& query, const Mat& train ); void radiusMatchTest( const Mat& query, const Mat& train );
Ptr<DescriptorMatcher> dmatcher; Ptr<DescriptorMatcher> dmatcher;
private:
CV_DescriptorMatcherTest& operator=(const CV_DescriptorMatcherTest&) { return *this; }
}; };
void CV_DescriptorMatcherTest::emptyDataTest() void CV_DescriptorMatcherTest::emptyDataTest()