mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bugs #1373, #2629, #2719

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-01-25 23:45:41 +04:00
parent d8f749da52
commit 1df10553bb
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,7 +716,7 @@ template<typename _Tp, int m> struct CV_EXPORTS Matx_DetOp
double operator ()(const Matx<_Tp, m, m>& a) const double operator ()(const Matx<_Tp, m, m>& a) const
{ {
Matx<_Tp, m, m> temp = a; 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 ) if( p == 0 )
return p; return p;
for( int i = 0; i < m; i++ ) for( int i = 0; i < m; i++ )

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); return i - (i > value);
#else #else
int i = cvRound(value); int i = cvRound(value);
Cv32suf diff; float diff = (float)(value - i);
diff.f = (float)(value - i); return i - (diff < 0);
return i - (diff.i < 0);
#endif #endif
} }
@ -360,9 +359,8 @@ CV_INLINE int cvCeil( double value )
return i + (i < value); return i + (i < value);
#else #else
int i = cvRound(value); int i = cvRound(value);
Cv32suf diff; float diff = (float)(i - value);
diff.f = (float)(i - value); return i + (diff < 0);
return i + (diff.i < 0);
#endif #endif
} }
@ -371,31 +369,19 @@ CV_INLINE int cvCeil( double value )
CV_INLINE int cvIsNaN( 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; Cv64suf ieee754;
ieee754.f = value; ieee754.f = value;
return ((unsigned)(ieee754.u >> 32) & 0x7fffffff) + return ((unsigned)(ieee754.u >> 32) & 0x7fffffff) +
((unsigned)ieee754.u != 0) > 0x7ff00000; ((unsigned)ieee754.u != 0) > 0x7ff00000;
#endif
} }
CV_INLINE int cvIsInf( double value ) 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; Cv64suf ieee754;
ieee754.f = value; ieee754.f = value;
return ((unsigned)(ieee754.u >> 32) & 0x7fffffff) == 0x7ff00000 && return ((unsigned)(ieee754.u >> 32) & 0x7fffffff) == 0x7ff00000 &&
(unsigned)ieee754.u == 0; (unsigned)ieee754.u == 0;
#endif
} }

3
modules/core/src/matrix.cpp
View File

@ -830,7 +830,8 @@ int Mat::checkVector(int _elemChannels, int _depth, bool _requireContinuous) con
{ {
return (depth() == _depth || _depth <= 0) && return (depth() == _depth || _depth <= 0) &&
(isContinuous() || !_requireContinuous) && (isContinuous() || !_requireContinuous) &&
((dims == 2 && (((rows == 1 || cols == 1) && channels() == _elemChannels) || (cols == _elemChannels))) || ((dims == 2 && (((rows == 1 || cols == 1) && channels() == _elemChannels) ||
(cols == _elemChannels && channels() == 1))) ||
(dims == 3 && channels() == 1 && size.p[2] == _elemChannels && (size.p[0] == 1 || size.p[1] == 1) && (dims == 3 && channels() == 1 && size.p[2] == _elemChannels && (size.p[0] == 1 || size.p[1] == 1) &&
(isContinuous() || step.p[1] == step.p[2]*size.p[2]))) (isContinuous() || step.p[1] == step.p[2]*size.p[2])))
? (int)(total()*channels()/_elemChannels) : -1; ? (int)(total()*channels()/_elemChannels) : -1;