mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16806 from anton-potapov:kw_fixes_own_mat_total_overflow

Browse Source
This commit is contained in:
Alexander Alekhin 2020-03-13 11:49:01 +00:00
commit 2a52e44bc6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/gapi/test/own/mat_tests.cpp
View File

@ -42,7 +42,7 @@ TEST(OwnMat, Create)
ASSERT_NE(m.data, nullptr); ASSERT_NE(m.data, nullptr);
ASSERT_EQ((cv::gapi::own::Size{m.cols, m.rows}), size); ASSERT_EQ((cv::gapi::own::Size{m.cols, m.rows}), size);
ASSERT_EQ(m.total(), static_cast<size_t>(size.height*size.width)); ASSERT_EQ(m.total(), static_cast<size_t>(size.height) * size.width);
ASSERT_EQ(m.type(), CV_8UC1); ASSERT_EQ(m.type(), CV_8UC1);
ASSERT_EQ(m.depth(), CV_8U); ASSERT_EQ(m.depth(), CV_8U);
ASSERT_EQ(m.channels(), 1); ASSERT_EQ(m.channels(), 1);
@ -61,7 +61,7 @@ TEST(OwnMat, CreateND)
ASSERT_NE(nullptr , m.data ); ASSERT_NE(nullptr , m.data );
ASSERT_EQ((cv::gapi::own::Size{0,0}), (cv::gapi::own::Size{m.cols, m.rows})); ASSERT_EQ((cv::gapi::own::Size{0,0}), (cv::gapi::own::Size{m.cols, m.rows}));
ASSERT_EQ(static_cast<size_t>(dims[0]*dims[1]*dims[2]*dims[3]), m.total()); ASSERT_EQ(multiply_dims(dims), m.total());
ASSERT_EQ(CV_32F , m.type() ); ASSERT_EQ(CV_32F , m.type() );
ASSERT_EQ(CV_32F , m.depth() ); ASSERT_EQ(CV_32F , m.depth() );
ASSERT_EQ(-1 , m.channels()); ASSERT_EQ(-1 , m.channels());
@ -307,7 +307,7 @@ TEST(OwnMat, AssignNDtoRegular)
ASSERT_NE(nullptr , a.data); ASSERT_NE(nullptr , a.data);
ASSERT_EQ(sz , (cv::gapi::own::Size{a.cols, a.rows})); ASSERT_EQ(sz , (cv::gapi::own::Size{a.cols, a.rows}));
ASSERT_EQ(static_cast<size_t>(sz.width*sz.height), a.total()); ASSERT_EQ(static_cast<size_t>(sz.width) * sz.height, a.total());
ASSERT_EQ(CV_8U , a.type()); ASSERT_EQ(CV_8U , a.type());
ASSERT_EQ(CV_8U , a.depth()); ASSERT_EQ(CV_8U , a.depth());
ASSERT_EQ(1 , a.channels()); ASSERT_EQ(1 , a.channels());
@ -322,7 +322,7 @@ TEST(OwnMat, AssignNDtoRegular)
ASSERT_NE(nullptr , a.data); ASSERT_NE(nullptr , a.data);
ASSERT_NE(old_ptr , a.data); ASSERT_NE(old_ptr , a.data);
ASSERT_EQ((cv::gapi::own::Size{0,0}), (cv::gapi::own::Size{a.cols, a.rows})); ASSERT_EQ((cv::gapi::own::Size{0,0}), (cv::gapi::own::Size{a.cols, a.rows}));
ASSERT_EQ(static_cast<size_t>(dims[0]*dims[1]*dims[2]*dims[3]), a.total()); ASSERT_EQ(multiply_dims(dims), a.total());
ASSERT_EQ(CV_32F , a.type()); ASSERT_EQ(CV_32F , a.type());
ASSERT_EQ(CV_32F , a.depth()); ASSERT_EQ(CV_32F , a.depth());
ASSERT_EQ(-1 , a.channels()); ASSERT_EQ(-1 , a.channels());
@ -342,7 +342,7 @@ TEST(OwnMat, AssignRegularToND)
ASSERT_NE(nullptr , a.data); ASSERT_NE(nullptr , a.data);
ASSERT_EQ((cv::gapi::own::Size{0,0}), (cv::gapi::own::Size{a.cols, a.rows})); ASSERT_EQ((cv::gapi::own::Size{0,0}), (cv::gapi::own::Size{a.cols, a.rows}));
ASSERT_EQ(static_cast<size_t>(dims[0]*dims[1]*dims[2]*dims[3]), a.total()); ASSERT_EQ(multiply_dims(dims), a.total());
ASSERT_EQ(CV_32F , a.type()); ASSERT_EQ(CV_32F , a.type());
ASSERT_EQ(CV_32F , a.depth()); ASSERT_EQ(CV_32F , a.depth());
ASSERT_EQ(-1 , a.channels()); ASSERT_EQ(-1 , a.channels());
@ -357,7 +357,7 @@ TEST(OwnMat, AssignRegularToND)
ASSERT_NE(nullptr , a.data); ASSERT_NE(nullptr , a.data);
ASSERT_NE(old_ptr , a.data); ASSERT_NE(old_ptr , a.data);
ASSERT_EQ(sz , (cv::gapi::own::Size{a.cols, a.rows})); ASSERT_EQ(sz , (cv::gapi::own::Size{a.cols, a.rows}));
ASSERT_EQ(static_cast<size_t>(sz.width*sz.height), a.total()); ASSERT_EQ(static_cast<size_t>(sz.width) * sz.height, a.total());
ASSERT_EQ(CV_8U , a.type()); ASSERT_EQ(CV_8U , a.type());
ASSERT_EQ(CV_8U , a.depth()); ASSERT_EQ(CV_8U , a.depth());
ASSERT_EQ(1 , a.channels()); ASSERT_EQ(1 , a.channels());