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

Merge pull request #339 from vpisarev:core_fixes

Browse Source
This commit is contained in:
Andrey Kamaev
2013-01-29 15:51:22 +04:00
committed by OpenCV Buildbot
parent 63873a8393 146ca61a27
commit 98fdd70466
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core/operations.hpp
View File

@@ -716,12 +716,12 @@ template<typename _Tp, int m> struct CV_EXPORTS Matx_DetOp
double operator ()(const Matx<_Tp, m, m>& a) const
{
Matx<_Tp, m, m> temp = a;
double p = LU(temp.val, m, m, 0, 0, 0);
double p = LU(temp.val, m*sizeof(_Tp), m, 0, 0, 0);
if( p == 0 )
return p;
for( int i = 0; i < m; i++ )
p *= temp(i, i);
return p;
return 1./p;
}
};

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

@@ -342,9 +342,8 @@ CV_INLINE int cvFloor( double value )
return i - (i > value);
#else
int i = cvRound(value);
Cv32suf diff;
diff.f = (float)(value - i);
return i - (diff.i < 0);
float diff = (float)(value - i);
return i - (diff < 0);
#endif
}
@@ -360,9 +359,8 @@ CV_INLINE int cvCeil( double value )
return i + (i < value);
#else
int i = cvRound(value);
Cv32suf diff;
diff.f = (float)(i - value);
return i + (diff.i < 0);
float diff = (float)(i - value);
return i + (diff < 0);
#endif
}
@@ -371,31 +369,19 @@ CV_INLINE int cvCeil( double value )
CV_INLINE int cvIsNaN( double value )
{
#if 1/*defined _MSC_VER || defined __BORLANDC__
return _isnan(value);
#elif defined __GNUC__
return isnan(value);
#else*/
Cv64suf ieee754;
ieee754.f = value;
return ((unsigned)(ieee754.u >> 32) & 0x7fffffff) +
((unsigned)ieee754.u != 0) > 0x7ff00000;
#endif
}
CV_INLINE int cvIsInf( double value )
{
#if 1/*defined _MSC_VER || defined __BORLANDC__
return !_finite(value);
#elif defined __GNUC__
return isinf(value);
#else*/
Cv64suf ieee754;
ieee754.f = value;
return ((unsigned)(ieee754.u >> 32) & 0x7fffffff) == 0x7ff00000 &&
(unsigned)ieee754.u == 0;
#endif
}