From 87e0eee92b98a16980c66414cf0b2536b0da21fc Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Tue, 11 Dec 2012 14:38:08 +0400 Subject: [PATCH] fixed remap and warp gpu tests --- modules/gpu/test/interpolation.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/gpu/test/interpolation.hpp b/modules/gpu/test/interpolation.hpp index f8aed1a389..8e723c5c08 100644 --- a/modules/gpu/test/interpolation.hpp +++ b/modules/gpu/test/interpolation.hpp @@ -42,6 +42,9 @@ #ifndef __OPENCV_TEST_INTERPOLATION_HPP__ #define __OPENCV_TEST_INTERPOLATION_HPP__ +#include "opencv2/core/core.hpp" +#include "opencv2/imgproc/imgproc.hpp" + template T readVal(const cv::Mat& src, int y, int x, int c, int border_type, cv::Scalar borderVal = cv::Scalar()) { if (border_type == cv::BORDER_CONSTANT) @@ -113,7 +116,7 @@ template struct CubicInterpolator for (float cx = xmin; cx <= xmax; cx += 1.0f) { const float w = bicubicCoeff(x - cx) * bicubicCoeff(y - cy); - sum += w * readVal(src, cvFloor(cy), cvFloor(cx), c, border_type, borderVal); + sum += w * readVal(src, (int) floorf(cy), (int) floorf(cx), c, border_type, borderVal); wsum += w; } }