potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-05-03 14:30:38 +00:00
parent 84b3b5b4a4 9fa01a7b70
commit 000a13b6a3
37 changed files with 2148 additions and 6905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/cvstd.inl.hpp
+2 -2
View File
@@ -265,10 +265,10 @@ std::ostream& operator << (std::ostream& out, const Rect_<_Tp>& rect)
static inline std::ostream& operator << (std::ostream& out, const MatSize& msize)
{
int i, dims = msize.p[-1];
int i, dims = msize.dims();
for( i = 0; i < dims; i++ )
{
out << msize.p[i];
out << msize[i];
if( i < dims-1 )
out << " x ";
}
modules/core/include/opencv2/core/mat.hpp
+3 -1
View File
@@ -236,6 +236,7 @@ public:
bool isUMatVector() const;
bool isMatx() const;
bool isVector() const;
bool isGpuMat() const;
bool isGpuMatVector() const;
~_InputArray();
@@ -544,10 +545,11 @@ struct CV_EXPORTS UMatData
struct CV_EXPORTS MatSize
{
explicit MatSize(int* _p);
int dims() const;
Size operator()() const;
const int& operator[](int i) const;
int& operator[](int i);
operator const int*() const;
operator const int*() const; // TODO OpenCV 4.0: drop this
bool operator == (const MatSize& sz) const;
bool operator != (const MatSize& sz) const;
modules/core/include/opencv2/core/mat.inl.hpp
+18 -3
View File
@@ -155,6 +155,7 @@ inline bool _InputArray::isMatx() const { return kind() == _InputArray::MATX; }
inline bool _InputArray::isVector() const { return kind() == _InputArray::STD_VECTOR ||
kind() == _InputArray::STD_BOOL_VECTOR ||
kind() == _InputArray::STD_ARRAY; }
inline bool _InputArray::isGpuMat() const { return kind() == _InputArray::CUDA_GPU_MAT; }
inline bool _InputArray::isGpuMatVector() const { return kind() == _InputArray::STD_VECTOR_CUDA_GPU_MAT; }
////////////////////////////////////////////////////////////////////////////////////////
@@ -1391,22 +1392,36 @@ inline
MatSize::MatSize(int* _p)
: p(_p) {}
inline
int MatSize::dims() const
{
return (p - 1)[0];
}
inline
Size MatSize::operator()() const
{
CV_DbgAssert(p[-1] <= 2);
CV_DbgAssert(dims() <= 2);
return Size(p[1], p[0]);
}
inline
const int& MatSize::operator[](int i) const
{
CV_DbgAssert(i < dims());
#ifdef __OPENCV_BUILD
CV_DbgAssert(i >= 0);
#endif
return p[i];
}
inline
int& MatSize::operator[](int i)
{
CV_DbgAssert(i < dims());
#ifdef __OPENCV_BUILD
CV_DbgAssert(i >= 0);
#endif
return p[i];
}
@@ -1419,8 +1434,8 @@ MatSize::operator const int*() const
inline
bool MatSize::operator == (const MatSize& sz) const
{
int d = p[-1];
int dsz = sz.p[-1];
int d = dims();
int dsz = sz.dims();
if( d != dsz )
return false;
if( d == 2 )