Commit 23bc89d6 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #16577 from Volskig:mp/ocv-gapi-work

parents 73ddc091 bce98376
...@@ -230,6 +230,7 @@ namespace cv { namespace gapi { namespace own { ...@@ -230,6 +230,7 @@ namespace cv { namespace gapi { namespace own {
*/ */
void create(Size _size, int _type) void create(Size _size, int _type)
{ {
GAPI_Assert(_size.height >= 0 && _size.width >= 0);
if (_size != Size{cols, rows} ) if (_size != Size{cols, rows} )
{ {
Mat tmp{_size.height, _size.width, _type, nullptr}; Mat tmp{_size.height, _size.width, _type, nullptr};
......
...@@ -588,4 +588,23 @@ TEST(OwnMat, ROIView) ...@@ -588,4 +588,23 @@ TEST(OwnMat, ROIView)
<< to_ocv(roi_view) << std::endl << to_ocv(roi_view) << std::endl
<< expected_cv_mat << std::endl; << expected_cv_mat << std::endl;
} }
TEST(OwnMat, CreateWithNegativeDims)
{
Mat own_mat;
ASSERT_ANY_THROW(own_mat.create(cv::Size{-1, -1}, CV_8U));
}
TEST(OwnMat, CreateWithNegativeWidth)
{
Mat own_mat;
ASSERT_ANY_THROW(own_mat.create(cv::Size{-1, 1}, CV_8U));
}
TEST(OwnMat, CreateWithNegativeHeight)
{
Mat own_mat;
ASSERT_ANY_THROW(own_mat.create(cv::Size{1, -1}, CV_8U));
}
} // namespace opencv_test } // namespace opencv_test
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