From f93cffaa0dd3263137ba3ff0d0fc52dd02422faa Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Thu, 8 Nov 2012 00:08:43 +0400 Subject: [PATCH] fix compilation under win --- modules/objdetect/src/icf.cpp | 2 +- modules/objdetect/src/softcascade.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/objdetect/src/icf.cpp b/modules/objdetect/src/icf.cpp index a41ae7a323..0401a06236 100644 --- a/modules/objdetect/src/icf.cpp +++ b/modules/objdetect/src/icf.cpp @@ -56,7 +56,7 @@ void cv::SCascade::Channels::appendHogBins(const cv::Mat gray, std::vector= 1.f)? 1.f : (0.89f * pow(relScale, 1.099f / log(2)))) / (relScale * relScale); + scaling[0] = ((relScale >= 1.f)? 1.f : (0.89f * pow(relScale, 1.099f / log(2.f)))) / (relScale * relScale); scaling[1] = 1.f; scaleshift = relScale * (1 << 16); }