Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
This commit is contained in:
commit
4d569732b9
@ -211,8 +211,8 @@ namespace cv
|
|||||||
{
|
{
|
||||||
flags &= roi.width < m.cols ? ~Mat::CONTINUOUS_FLAG : -1;
|
flags &= roi.width < m.cols ? ~Mat::CONTINUOUS_FLAG : -1;
|
||||||
offset += roi.y * step + roi.x * elemSize();
|
offset += roi.y * step + roi.x * elemSize();
|
||||||
CV_Assert( 0 <= roi.x && 0 <= roi.width && roi.x + roi.width <= m.cols &&
|
CV_Assert( 0 <= roi.x && 0 <= roi.width && roi.x + roi.width <= m.wholecols &&
|
||||||
0 <= roi.y && 0 <= roi.height && roi.y + roi.height <= m.rows );
|
0 <= roi.y && 0 <= roi.height && roi.y + roi.height <= m.wholerows );
|
||||||
if( refcount )
|
if( refcount )
|
||||||
CV_XADD(refcount, 1);
|
CV_XADD(refcount, 1);
|
||||||
if( rows <= 0 || cols <= 0 )
|
if( rows <= 0 || cols <= 0 )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user