Commit ef2e5a9f authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #8988 from sovrasov:repeat_src_eq_dst_fix

parents 48924cd8 4f987181
...@@ -856,6 +856,7 @@ void repeat(InputArray _src, int ny, int nx, OutputArray _dst) ...@@ -856,6 +856,7 @@ void repeat(InputArray _src, int ny, int nx, OutputArray _dst)
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
CV_Assert(_src.getObj() != _dst.getObj());
CV_Assert( _src.dims() <= 2 ); CV_Assert( _src.dims() <= 2 );
CV_Assert( ny > 0 && nx > 0 ); CV_Assert( ny > 0 && nx > 0 );
......
...@@ -145,3 +145,12 @@ TEST(Core_String, end_method_regression) ...@@ -145,3 +145,12 @@ TEST(Core_String, end_method_regression)
cv::String new_string(old_string.begin(), old_string.end()); cv::String new_string(old_string.begin(), old_string.end());
EXPECT_EQ(6u, new_string.size()); EXPECT_EQ(6u, new_string.size());
} }
TEST(Core_Copy, repeat_regression_8972)
{
Mat src = (Mat_<int>(1, 4) << 1, 2, 3, 4);
ASSERT_ANY_THROW({
repeat(src, 5, 1, src);
});
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment