Merge pull request #3400 from vpisarev:fixed_umat_test_crash

2014-11-07 12:50:26 +00:00
parent 569a95e9e1 7c8789dc12
commit 9b13b07639
1 changed files with 6 additions and 0 deletions
--- a/modules/core/test/test_umat.cpp
+++ b/modules/core/test/test_umat.cpp
@@ -130,6 +130,12 @@ TEST_P(UMatBasicTests, swap)

 TEST_P(UMatBasicTests, base)
 {
+    const int align_mask = 3;
+    roi.x &= ~align_mask;
+    roi.y &= ~align_mask;
+    roi.width = (roi.width + align_mask) & ~align_mask;
+    roi &= Rect(0, 0, ua.cols, ua.rows);
+
    if(useRoi)
    {
        ua = UMat(ua,roi);