third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix warnings under win

Browse Source
This commit is contained in:
marina.kolpakova 2013-01-10 15:38:51 +04:00
parent a28f5a89b3
commit c0462358ca
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sft/config.cpp
View File

@ -121,6 +121,8 @@ struct Out
void operator ()(const T a) const {out << a << " ";} void operator ()(const T a) const {out << a << " ";}
std::ostream& out; std::ostream& out;
private:
Out& operator=(Out const& other);
}; };
std::ostream& sft::operator<<(std::ostream& out, const Config& m) std::ostream& sft::operator<<(std::ostream& out, const Config& m)

4
apps/sft/include/sft/config.hpp
View File

@ -60,7 +60,7 @@ struct Config
// Scaled and shrunk model size. // Scaled and shrunk model size.
cv::Size model(ivector::const_iterator it) const cv::Size model(ivector::const_iterator it) const
{ {
float octave = powf(2.f, *it); float octave = powf(2.f, (float)(*it));
return cv::Size( cvRound(modelWinSize.width * octave) / shrinkage, return cv::Size( cvRound(modelWinSize.width * octave) / shrinkage,
cvRound(modelWinSize.height * octave) / shrinkage ); cvRound(modelWinSize.height * octave) / shrinkage );
} }
@ -68,7 +68,7 @@ struct Config
// Scaled but, not shrunk bounding box for object in sample image. // Scaled but, not shrunk bounding box for object in sample image.
cv::Rect bbox(ivector::const_iterator it) const cv::Rect bbox(ivector::const_iterator it) const
{ {
float octave = powf(2.f, *it); float octave = powf(2.f, (float)(*it));
return cv::Rect( cvRound(offset.x * octave), cvRound(offset.y * octave), return cv::Rect( cvRound(offset.x * octave), cvRound(offset.y * octave),
cvRound(modelWinSize.width * octave), cvRound(modelWinSize.height * octave)); cvRound(modelWinSize.width * octave), cvRound(modelWinSize.height * octave));
} }