From c0462358cab2dffc88582b06154c7604d8bd9279 Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Thu, 10 Jan 2013 15:38:51 +0400 Subject: [PATCH] fix warnings under win --- apps/sft/config.cpp | 2 ++ apps/sft/include/sft/config.hpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/sft/config.cpp b/apps/sft/config.cpp index ca9d02d..d993722 100644 --- a/apps/sft/config.cpp +++ b/apps/sft/config.cpp @@ -121,6 +121,8 @@ struct Out void operator ()(const T a) const {out << a << " ";} std::ostream& out; +private: + Out& operator=(Out const& other); }; std::ostream& sft::operator<<(std::ostream& out, const Config& m) diff --git a/apps/sft/include/sft/config.hpp b/apps/sft/include/sft/config.hpp index e63b1c9..dd5e8d5 100644 --- a/apps/sft/include/sft/config.hpp +++ b/apps/sft/include/sft/config.hpp @@ -60,7 +60,7 @@ struct Config // Scaled and shrunk model size. 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, cvRound(modelWinSize.height * octave) / shrinkage ); } @@ -68,7 +68,7 @@ struct Config // Scaled but, not shrunk bounding box for object in sample image. 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), cvRound(modelWinSize.width * octave), cvRound(modelWinSize.height * octave)); } -- 2.7.4