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

Merge pull request #6911 from ilya-lavrenov:push_back

Browse Source
This commit is contained in:
Maksim Shabunin 2016-07-18 07:33:12 +00:00
commit 1efa7f4d27
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/matrix.cpp
View File

@ -839,9 +839,9 @@ void Mat::push_back(const Mat& elems)
bool eq = size == elems.size; bool eq = size == elems.size;
size.p[0] = r; size.p[0] = r;
if( !eq ) if( !eq )
CV_Error(CV_StsUnmatchedSizes, ""); CV_Error(CV_StsUnmatchedSizes, "Pushed vector length is not equal to matrix row length");
if( type() != elems.type() ) if( type() != elems.type() )
CV_Error(CV_StsUnmatchedFormats, ""); CV_Error(CV_StsUnmatchedFormats, "Pushed vector type is not the same as matrix type");
if( isSubmatrix() || dataend + step.p[0]*delta > datalimit ) if( isSubmatrix() || dataend + step.p[0]*delta > datalimit )
reserve( std::max(r + delta, (r*3+1)/2) ); reserve( std::max(r + delta, (r*3+1)/2) );

18
modules/core/test/test_mat.cpp
View File

@ -1520,3 +1520,21 @@ TEST(Reduce, regression_should_fail_bug_4594)
EXPECT_NO_THROW(cv::reduce(src, dst, 0, CV_REDUCE_SUM, CV_32S)); EXPECT_NO_THROW(cv::reduce(src, dst, 0, CV_REDUCE_SUM, CV_32S));
EXPECT_NO_THROW(cv::reduce(src, dst, 0, CV_REDUCE_AVG, CV_32S)); EXPECT_NO_THROW(cv::reduce(src, dst, 0, CV_REDUCE_AVG, CV_32S));
} }
TEST(Mat, push_back_vector)
{
cv::Mat result(1, 5, CV_32FC1);
std::vector<float> vec1(result.cols + 1);
std::vector<int> vec2(result.cols);
EXPECT_THROW(result.push_back(vec1), cv::Exception);
EXPECT_THROW(result.push_back(vec2), cv::Exception);
vec1.resize(result.cols);
for (int i = 0; i < 5; ++i)
result.push_back(cv::Mat(vec1).reshape(1, 1));
ASSERT_EQ(6, result.rows);
}