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

added ios camera support in highgui. turned on optimization in opencv2.framework (ticket #2232)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-08-20 19:36:36 +04:00
parent c26d543e1e
commit 8efb84b5a4
7 changed files with 1398 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,7 +440,7 @@ template<typename _Tp, int m, int n> class CV_EXPORTS Matx
{
public:
typedef _Tp value_type;
typedef Matx<_Tp, MIN(m, n), 1> diag_type;
typedef Matx<_Tp, (m < n ? m : n), 1> diag_type;
typedef Matx<_Tp, m, n> mat_type;
enum { depth = DataDepth<_Tp>::value, rows = m, cols = n, channels = rows*cols,
type = CV_MAKETYPE(depth, channels) };