projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6bf8f47
)
Fix oclMat constructor when roi is provided.
author
Jin Ma
<jinma06njuee@gmail.om>
Thu, 4 Jul 2013 08:14:55 +0000
(16:14 +0800)
committer
Jin Ma
<jinma06njuee@gmail.om>
Thu, 4 Jul 2013 08:14:55 +0000
(16:14 +0800)
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
patch
|
blob
|
history
diff --git
a/modules/ocl/include/opencv2/ocl/matrix_operations.hpp
b/modules/ocl/include/opencv2/ocl/matrix_operations.hpp
index
fcd847c
..
55f2fc9
100644
(file)
--- 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.
whole
cols &&
+ 0 <= roi.y && 0 <= roi.height && roi.y + roi.height <= m.
whole
rows );
if( refcount )
CV_XADD(refcount, 1);
if( rows <= 0 || cols <= 0 )