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

removed duplication

Browse Source
This commit is contained in:
Vladislav Vinogradov 2013-04-01 11:29:13 +04:00
parent 5a4fa4607b
commit ce2284e2e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,7 +431,7 @@ template<typename _Tp> inline _Tp* Mat::ptr(int y)
template<typename _Tp> inline const _Tp* Mat::ptr(int y) const template<typename _Tp> inline const _Tp* Mat::ptr(int y) const
{ {
CV_DbgAssert( y == 0 || (data && dims >= 1 && data && (unsigned)y < (unsigned)size.p[0]) ); CV_DbgAssert( y == 0 || (data && dims >= 1 && (unsigned)y < (unsigned)size.p[0]) );
return (const _Tp*)(data + step.p[0]*y); return (const _Tp*)(data + step.p[0]*y);
} }

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

@ -184,7 +184,7 @@ static void finalizeHdr(Mat& m)
void Mat::create(int d, const int* _sizes, int _type) void Mat::create(int d, const int* _sizes, int _type)
{ {
int i; int i;
CV_Assert(0 <= d && _sizes && d <= CV_MAX_DIM && _sizes); CV_Assert(0 <= d && d <= CV_MAX_DIM && _sizes);
_type = CV_MAT_TYPE(_type); _type = CV_MAT_TYPE(_type);
if( data && (d == dims || (d == 1 && dims <= 2)) && _type == type() ) if( data && (d == dims || (d == 1 && dims <= 2)) && _type == type() )