Merge pull request #642 from taka-no-me:fix1

2013-03-14 11:42:05 +04:00
parent f622a2e79c 7e50d3e571
commit b076b69e68
8 changed files with 11 additions and 9 deletions
--- a/modules/softcascade/src/softcascade.cpp
+++ b/modules/softcascade/src/softcascade.cpp
@@ -53,7 +53,7 @@ namespace {
 struct SOctave
 {
    SOctave(const int i, const cv::Size& origObjSize, const cv::FileNode& fn)
-    : index(i), weaks((int)fn[SC_OCT_WEAKS]), scale(std::pow(2,(float)fn[SC_OCT_SCALE])),
+    : index(i), weaks((int)fn[SC_OCT_WEAKS]), scale((float)std::pow(2,(float)fn[SC_OCT_SCALE])),
      size(cvRound(origObjSize.width * scale), cvRound(origObjSize.height * scale)) {}

    int   index;