generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed compile errors under win

Browse Source
This commit is contained in:
Maria Dimashova 2012-07-14 13:25:41 +00:00
parent 7bbc42127e
commit 2bd86e2541
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/features2d/test/test_rotation_invariance.cpp
View File

@ -63,14 +63,14 @@ Mat generateHomography(float angle)
static static
Mat rotateImage(const Mat& srcImage, float angle, Mat& dstImage, Mat& dstMask) 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 Mat LUShift = Mat::eye(3, 3, CV_32FC1); // left up
LUShift.at<float>(0,2) = -srcImage.cols/2; LUShift.at<float>(0,2) = -srcImage.cols/2;
LUShift.at<float>(1,2) = -srcImage.rows/2; LUShift.at<float>(1,2) = -srcImage.rows/2;
Mat RDShift = Mat::eye(3, 3, CV_32FC1); // right down Mat RDShift = Mat::eye(3, 3, CV_32FC1); // right down
RDShift.at<float>(0,2) = diag/2; RDShift.at<float>(0,2) = diag/2;
RDShift.at<float>(1,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)); Mat srcMask(srcImage.size(), CV_8UC1, Scalar(255));

4
modules/nonfree/test/test_rotation_invariance.cpp
View File

@ -63,14 +63,14 @@ Mat generateHomography(float angle)
static static
Mat rotateImage(const Mat& srcImage, float angle, Mat& dstImage, Mat& dstMask) 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 Mat LUShift = Mat::eye(3, 3, CV_32FC1); // left up
LUShift.at<float>(0,2) = -srcImage.cols/2; LUShift.at<float>(0,2) = -srcImage.cols/2;
LUShift.at<float>(1,2) = -srcImage.rows/2; LUShift.at<float>(1,2) = -srcImage.rows/2;
Mat RDShift = Mat::eye(3, 3, CV_32FC1); // right down Mat RDShift = Mat::eye(3, 3, CV_32FC1); // right down
RDShift.at<float>(0,2) = diag/2; RDShift.at<float>(0,2) = diag/2;
RDShift.at<float>(1,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)); Mat srcMask(srcImage.size(), CV_8UC1, Scalar(255));