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

warnings

Browse Source
This commit is contained in:
Anatoly Baksheev 2011-09-05 14:37:27 +00:00
parent fbe2e6fb01
commit 415978b1c9
5 changed files with 453 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/contrib/src/hybridtracker.cpp
View File

@ -199,15 +199,15 @@ void CvHybridTracker::updateTrackerWithEM(Mat image) {
for (int i = 0; i < proj.rows; i++) for (int i = 0; i < proj.rows; i++)
for (int j = 0; j < proj.cols; j++) for (int j = 0; j < proj.cols; j++)
if (proj.at<double> (i, j) > 0) { if (proj.at<double> (i, j) > 0) {
samples->data.fl[count * 2] = i; samples->data.fl[count * 2] = (float)i;
samples->data.fl[count * 2 + 1] = j; samples->data.fl[count * 2 + 1] = (float)j;
count++; count++;
} }
em_model.train(samples, 0, params.em_params, labels); em_model.train(samples, 0, params.em_params, labels);
curr_center.x = em_model.getMeans().at<double> (0, 0); curr_center.x = (float)em_model.getMeans().at<double> (0, 0);
curr_center.y = em_model.getMeans().at<double> (0, 1); curr_center.y = (float)em_model.getMeans().at<double> (0, 1);
} }
void CvHybridTracker::updateTrackerWithLowPassFilter(Mat image) { void CvHybridTracker::updateTrackerWithLowPassFilter(Mat image) {

2
modules/contrib/src/retinafilter.cpp
View File

@ -526,6 +526,4 @@ const bool RetinaFilter::getMagnoParaFoveaResponse(std::valarray<float> &magnoPa
return true; return true;
} }
} }

8
modules/core/src/cmdparser.cpp
View File

@ -287,25 +287,25 @@ std::string CommandLineParser::analizeValue<std::string>(const std::string& str,
} }
template<> template<>
int CommandLineParser::analizeValue<int>(const std::string& str, bool space_delete) int CommandLineParser::analizeValue<int>(const std::string& str, bool /*space_delete*/)
{ {
return fromStringNumber<int>(str); return fromStringNumber<int>(str);
} }
template<> template<>
unsigned int CommandLineParser::analizeValue<unsigned int>(const std::string& str, bool space_delete) unsigned int CommandLineParser::analizeValue<unsigned int>(const std::string& str, bool /*space_delete*/)
{ {
return fromStringNumber<unsigned int>(str); return fromStringNumber<unsigned int>(str);
} }
template<> template<>
float CommandLineParser::analizeValue<float>(const std::string& str, bool space_delete) float CommandLineParser::analizeValue<float>(const std::string& str, bool /*space_delete*/)
{ {
return fromStringNumber<float>(str); return fromStringNumber<float>(str);
} }
template<> template<>
double CommandLineParser::analizeValue<double>(const std::string& str, bool space_delete) double CommandLineParser::analizeValue<double>(const std::string& str, bool /*space_delete*/)
{ {
return fromStringNumber<double>(str); return fromStringNumber<double>(str);
} }

6
modules/core/test/test_operations.cpp
View File

@ -780,14 +780,14 @@ bool CV_OperationsTest::TestVec()
//these compile //these compile
cv::Vec3b b = a; cv::Vec3b b = a;
hsvImage_f.at<cv::Vec3f>(i,j) = cv::Vec3f(i,0,1); hsvImage_f.at<cv::Vec3f>(i,j) = cv::Vec3f((float)i,0,1);
hsvImage_b.at<cv::Vec3b>(i,j) = cv::Vec3b(cv::Vec3f(i,0,1)); hsvImage_b.at<cv::Vec3b>(i,j) = cv::Vec3b(cv::Vec3f((float)i,0,1));
//these don't //these don't
b = cv::Vec3f(1,0,0); b = cv::Vec3f(1,0,0);
cv::Vec3b c; cv::Vec3b c;
c = cv::Vec3f(0,0,1); c = cv::Vec3f(0,0,1);
hsvImage_b.at<cv::Vec3b>(i,j) = cv::Vec3f(i,0,1); hsvImage_b.at<cv::Vec3b>(i,j) = cv::Vec3f((float)i,0,1);
hsvImage_b.at<cv::Vec3b>(i,j) = a; hsvImage_b.at<cv::Vec3b>(i,j) = a;
hsvImage_b.at<cv::Vec3b>(i,j) = cv::Vec3f(1,2,3); hsvImage_b.at<cv::Vec3b>(i,j) = cv::Vec3f(1,2,3);
} }

2
modules/imgproc/src/phasecorr.cpp
View File

@ -322,7 +322,7 @@ void cv::createHanningWindow(OutputArray _dst, cv::Size winSize, int type)
for(int j = 0; j < cols; j++) for(int j = 0; j < cols; j++)
{ {
double wc = 0.5 * (1.0f - cos(2.0f * CV_PI * (double)j / (double)(cols - 1))); double wc = 0.5 * (1.0f - cos(2.0f * CV_PI * (double)j / (double)(cols - 1)));
dstData[i*cols + j] = wr * wc; dstData[i*cols + j] = (float)(wr * wc);
} }
} }