From 7c8789dc12a9c10d349686a5b22bb0064fa7f32f Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Fri, 7 Nov 2014 14:49:48 +0300 Subject: [PATCH] fixed my_umat(roi).clone() test by disabling poorly aligned ROI's. Real fix of the problem will require a separate branch in UMat::copyTo(). --- modules/core/test/test_umat.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/core/test/test_umat.cpp b/modules/core/test/test_umat.cpp index 8e51aadad2..0e25b6ba9a 100644 --- 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);