From 97e620b8f3ead7e2843fbd3b8f6d7b9c34bad1cd Mon Sep 17 00:00:00 2001 From: Jin Ma Date: Thu, 4 Jul 2013 16:14:55 +0800 Subject: [PATCH] Fix oclMat constructor when roi is provided. --- modules/ocl/include/opencv2/ocl/matrix_operations.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ocl/include/opencv2/ocl/matrix_operations.hpp b/modules/ocl/include/opencv2/ocl/matrix_operations.hpp index fcd847cb6b..55f2fc9fa1 100644 --- a/modules/ocl/include/opencv2/ocl/matrix_operations.hpp +++ b/modules/ocl/include/opencv2/ocl/matrix_operations.hpp @@ -211,8 +211,8 @@ namespace cv { flags &= roi.width < m.cols ? ~Mat::CONTINUOUS_FLAG : -1; offset += roi.y * step + roi.x * elemSize(); - CV_Assert( 0 <= roi.x && 0 <= roi.width && roi.x + roi.width <= m.cols && - 0 <= roi.y && 0 <= roi.height && roi.y + roi.height <= m.rows ); + 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.wholerows ); if( refcount ) CV_XADD(refcount, 1); if( rows <= 0 || cols <= 0 )