Merge pull request #22293 from mshabunin:fix-buffer-area-uas

pull/22303/head
Alexander Alekhin 2 years ago
commit 6ce2f1316f
  1. 3
      modules/core/src/buffer_area.cpp
  2. 7
      modules/core/test/test_utils.cpp

@ -29,8 +29,7 @@ public:
} }
void cleanup() const void cleanup() const
{ {
CV_Assert(ptr && *ptr); CV_DbgAssert(ptr);
*ptr = 0;
if (raw_mem) if (raw_mem)
fastFree(raw_mem); fastFree(raw_mem);
} }

@ -403,9 +403,6 @@ TEST_P(BufferArea, basic)
EXPECT_EQ((double)0, dbl_ptr[i]); EXPECT_EQ((double)0, dbl_ptr[i]);
} }
} }
EXPECT_TRUE(int_ptr == NULL);
EXPECT_TRUE(uchar_ptr == NULL);
EXPECT_TRUE(dbl_ptr == NULL);
} }
TEST_P(BufferArea, align) TEST_P(BufferArea, align)
@ -442,10 +439,6 @@ TEST_P(BufferArea, align)
} }
} }
} }
for (size_t i = 0; i < CNT; ++i)
{
EXPECT_TRUE(buffers[i] == NULL);
}
} }
TEST_P(BufferArea, default_align) TEST_P(BufferArea, default_align)

Loading…
Cancel
Save