Commit f93cffaa authored by marina.kolpakova's avatar marina.kolpakova

fix compilation under win

parent 1022094d
...@@ -56,7 +56,7 @@ void cv::SCascade::Channels::appendHogBins(const cv::Mat gray, std::vector<cv::M ...@@ -56,7 +56,7 @@ void cv::SCascade::Channels::appendHogBins(const cv::Mat gray, std::vector<cv::M
cv::Sobel(gray, df_dy, CV_32F, 0, 1); cv::Sobel(gray, df_dy, CV_32F, 0, 1);
cv::cartToPolar(df_dx, df_dy, mag, angle, true); cv::cartToPolar(df_dx, df_dy, mag, angle, true);
mag *= (1.f / (8 * sqrt(2))); mag *= (1.f / (8 * sqrt(2.f)));
cv::Mat nmag; cv::Mat nmag;
mag.convertTo(nmag, CV_8UC1); mag.convertTo(nmag, CV_8UC1);
......
...@@ -132,7 +132,7 @@ struct Level ...@@ -132,7 +132,7 @@ struct Level
workRect(cv::Size(cvRound(w / (float)shrinkage),cvRound(h / (float)shrinkage))), workRect(cv::Size(cvRound(w / (float)shrinkage),cvRound(h / (float)shrinkage))),
objSize(cv::Size(cvRound(oct.size.width * relScale), cvRound(oct.size.height * relScale))) objSize(cv::Size(cvRound(oct.size.width * relScale), cvRound(oct.size.height * relScale)))
{ {
scaling[0] = ((relScale >= 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; scaling[1] = 1.f;
scaleshift = relScale * (1 << 16); scaleshift = relScale * (1 << 16);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment