Skip to content

O
opencv
Commit ce2284e2 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

removed duplication

parent 5a4fa460
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/core/include/opencv2/core/mat.hpp
View file @ ce2284e2
...@@ -431,7 +431,7 @@ template<typename _Tp> inline _Tp* Mat::ptr(int y) ...@@ -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);
} }
......
modules/core/src/matrix.cpp
View file @ ce2284e2
...@@ -184,7 +184,7 @@ static void finalizeHdr(Mat& m) ...@@ -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() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment