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

fixed cast of Mat to vector<Mat> (leads to compile error now)

Browse Source
This commit is contained in:
Maria Dimashova 2010-10-18 11:06:44 +00:00
parent bf584f0d0a
commit a594f01a3e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,6 +390,7 @@ template<typename _Tp> class CV_EXPORTS DataDepth { public: enum { value = -1, f
template<> class DataDepth<bool> { public: enum { value = CV_8U, fmt=(int)'u' }; }; template<> class DataDepth<bool> { public: enum { value = CV_8U, fmt=(int)'u' }; };
template<> class DataDepth<uchar> { public: enum { value = CV_8U, fmt=(int)'u' }; }; template<> class DataDepth<uchar> { public: enum { value = CV_8U, fmt=(int)'u' }; };
template<> class DataDepth<schar> { public: enum { value = CV_8S, fmt=(int)'c' }; }; template<> class DataDepth<schar> { public: enum { value = CV_8S, fmt=(int)'c' }; };
template<> class DataDepth<char> { public: enum { value = CV_8S, fmt=(int)'c' }; };
template<> class DataDepth<ushort> { public: enum { value = CV_16U, fmt=(int)'w' }; }; template<> class DataDepth<ushort> { public: enum { value = CV_16U, fmt=(int)'w' }; };
template<> class DataDepth<short> { public: enum { value = CV_16S, fmt=(int)'s' }; }; template<> class DataDepth<short> { public: enum { value = CV_16S, fmt=(int)'s' }; };
template<> class DataDepth<int> { public: enum { value = CV_32S, fmt=(int)'i' }; }; template<> class DataDepth<int> { public: enum { value = CV_32S, fmt=(int)'i' }; };
@ -969,9 +970,6 @@ public:
typedef value_type work_type; typedef value_type work_type;
typedef value_type channel_type; typedef value_type channel_type;
typedef value_type vec_type; typedef value_type vec_type;
enum { depth = DataDepth<channel_type>::value, channels = 1,
fmt=DataDepth<channel_type>::fmt,
type = CV_MAKETYPE(depth, channels) };
}; };
template<> class DataType<bool> template<> class DataType<bool>
@ -1010,6 +1008,18 @@ public:
type = CV_MAKETYPE(depth, channels) }; type = CV_MAKETYPE(depth, channels) };
}; };
template<> class DataType<char>
{
public:
typedef schar value_type;
typedef int work_type;
typedef value_type channel_type;
typedef value_type vec_type;
enum { depth = DataDepth<channel_type>::value, channels = 1,
fmt=DataDepth<channel_type>::fmt,
type = CV_MAKETYPE(depth, channels) };
};
template<> class DataType<ushort> template<> class DataType<ushort>
{ {
public: public: