fixed remap and warp gpu tests
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Tue, 11 Dec 2012 10:38:08 +0000 (14:38 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Tue, 11 Dec 2012 10:38:08 +0000 (14:38 +0400)
modules/gpu/test/interpolation.hpp

index f8aed1a..8e723c5 100644 (file)
@@ -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 <typename T> 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 <typename T> struct CubicInterpolator
             for (float cx = xmin; cx <= xmax; cx += 1.0f)
             {
                 const float w = bicubicCoeff(x - cx) * bicubicCoeff(y - cy);
-                sum += w * readVal<T>(src, cvFloor(cy), cvFloor(cx), c, border_type, borderVal);
+                sum += w * readVal<T>(src, (int) floorf(cy), (int) floorf(cx), c, border_type, borderVal);
                 wsum += w;
             }
         }