Commit 652606f7 authored by Andrey Kamaev's avatar Andrey Kamaev Committed by OpenCV Buildbot

Merge pull request #770 from asmorkalov:winrt

parents 80fed87d a914088f
...@@ -315,6 +315,8 @@ CV_INLINE int cvRound( double value ) ...@@ -315,6 +315,8 @@ CV_INLINE int cvRound( double value )
fistp t; fistp t;
} }
return t; return t;
#elif defined _MSC_VER && defined _M_ARM && defined HAVE_TEGRA_OPTIMIZATION
TEGRA_ROUND(value);
#elif defined HAVE_LRINT || defined CV_ICC || defined __GNUC__ #elif defined HAVE_LRINT || defined CV_ICC || defined __GNUC__
# ifdef HAVE_TEGRA_OPTIMIZATION # ifdef HAVE_TEGRA_OPTIMIZATION
TEGRA_ROUND(value); TEGRA_ROUND(value);
...@@ -324,7 +326,7 @@ CV_INLINE int cvRound( double value ) ...@@ -324,7 +326,7 @@ CV_INLINE int cvRound( double value )
#else #else
double intpart, fractpart; double intpart, fractpart;
fractpart = modf(value, &intpart); fractpart = modf(value, &intpart);
if ((abs(fractpart) != 0.5) || ((((int)intpart) % 2) != 0)) if ((fabs(fractpart) != 0.5) || ((((int)intpart) % 2) != 0))
return (int)(value + (value >= 0 ? 0.5 : -0.5)); return (int)(value + (value >= 0 ? 0.5 : -0.5));
else else
return (int)intpart; return (int)intpart;
......
...@@ -1740,7 +1740,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize, ...@@ -1740,7 +1740,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,
#ifdef HAVE_TEGRA_OPTIMIZATION #ifdef HAVE_TEGRA_OPTIMIZATION
if (tegra::resize(src, dst, inv_scale_x, inv_scale_y, interpolation)) if (tegra::resize(src, dst, (float)inv_scale_x, (float)inv_scale_y, interpolation))
return; return;
#endif #endif
......
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