Skip to content

O
opencv
Commit 2bd86e25 authored by Maria Dimashova's avatar Maria Dimashova
Browse files
Options

fixed compile errors under win

parent 7bbc4212
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/features2d/test/test_rotation_invariance.cpp
View file @ 2bd86e25
......@@ -63,14 +63,14 @@ Mat generateHomography(float angle)
static
Mat rotateImage(const Mat& srcImage, float angle, Mat& dstImage, Mat& dstMask)
{
int diag = std::sqrt(srcImage.cols * srcImage.cols + srcImage.rows * srcImage.rows);
float diag = std::sqrt(static_cast<float>(srcImage.cols * srcImage.cols + srcImage.rows * srcImage.rows));
Mat LUShift = Mat::eye(3, 3, CV_32FC1); // left up
LUShift.at<float>(0,2) = -srcImage.cols/2;
LUShift.at<float>(1,2) = -srcImage.rows/2;
Mat RDShift = Mat::eye(3, 3, CV_32FC1); // right down
RDShift.at<float>(0,2) = diag/2;
RDShift.at<float>(1,2) = diag/2;
Size sz(diag, diag);
Size sz(cvRound(diag), cvRound(diag));
Mat srcMask(srcImage.size(), CV_8UC1, Scalar(255));
......
modules/nonfree/test/test_rotation_invariance.cpp
View file @ 2bd86e25
......@@ -63,14 +63,14 @@ Mat generateHomography(float angle)
static
Mat rotateImage(const Mat& srcImage, float angle, Mat& dstImage, Mat& dstMask)
{
int diag = std::sqrt(srcImage.cols * srcImage.cols + srcImage.rows * srcImage.rows);
float diag = std::sqrt(static_cast<float>(srcImage.cols * srcImage.cols + srcImage.rows * srcImage.rows));
Mat LUShift = Mat::eye(3, 3, CV_32FC1); // left up
LUShift.at<float>(0,2) = -srcImage.cols/2;
LUShift.at<float>(1,2) = -srcImage.rows/2;
Mat RDShift = Mat::eye(3, 3, CV_32FC1); // right down
RDShift.at<float>(0,2) = diag/2;
RDShift.at<float>(1,2) = diag/2;
Size sz(diag, diag);
Size sz(cvRound(diag), cvRound(diag));
Mat srcMask(srcImage.size(), CV_8UC1, Scalar(255));
......
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