Merge pull request #3400 from vpisarev:fixed_umat_test_crash

9b13b076 · Vadim Pisarevsky · 569a95e9 · 7c8789dc · 9b13b076
Commit 9b13b076 authored Nov 07, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

test_umat.cpp modules/core/test/test_umat.cpp +6 -0

No files found.
--- 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);