generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6747 from ludv1x:master

Browse Source
This commit is contained in:
Alexander Alekhin 2016-06-30 08:02:19 +00:00
commit e98c1bfb53
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/utility.hpp
View File

@ -817,10 +817,10 @@ AutoBuffer<_Tp, fixed_size>::allocate(size_t _size)
return;
}
deallocate();
sz = _size;
if(_size > fixed_size)
{
ptr = new _Tp[_size];
sz = _size;
}
}

14
modules/core/test/test_utils.cpp
View File

@ -27,6 +27,7 @@ TEST(CommandLineParser, testFailure)
parser.get<bool>("h");
EXPECT_FALSE(parser.check());
}
TEST(CommandLineParser, testHas_noValues)
{
const char* argv[] = {"<bin>", "-h", "--info"};
@ -218,4 +219,17 @@ TEST(CommandLineParser, positional_regression_5074_equal_sign)
EXPECT_TRUE(parser.check());
}
TEST(AutoBuffer, allocate_test)
{
AutoBuffer<int, 5> abuf(2);
EXPECT_EQ(2, abuf.size());
abuf.allocate(4);
EXPECT_EQ(4, abuf.size());
abuf.allocate(6);
EXPECT_EQ(6, abuf.size());
}
} // namespace