mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #770 from asmorkalov:winrt

Browse Source
This commit is contained in:
Andrey Kamaev 2013-04-04 20:01:55 +04:00 committed by OpenCV Buildbot
commit 652606f780
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core/types_c.h
View File

@ -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 )
#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;

2
modules/imgproc/src/imgwarp.cpp
View File

@ -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