Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed duplication

Browse Source
pull/726/head
Vladislav Vinogradov 12 years ago
parent 5a4fa4607b
commit ce2284e2e6
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/core/include/opencv2/core/mat.hpp
  2. 2
      modules/core/src/matrix.cpp

2
modules/core/include/opencv2/core/mat.hpp
Unescape 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
Unescape 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() )

Write Preview
Loading…
Cancel
Save