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

fixed http://code.opencv.org/issues/3828, added test. thanks to berak for the patch

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-04-29 13:12:53 +03:00
parent 0746ec7035
commit d8f360316d
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/stat.cpp
View File

@ -3826,6 +3826,11 @@ void cv::findNonZero( InputArray _src, OutputArray _idx )
Mat src = _src.getMat(); Mat src = _src.getMat();
CV_Assert( src.type() == CV_8UC1 ); CV_Assert( src.type() == CV_8UC1 );
int n = countNonZero(src); int n = countNonZero(src);
if( n == 0 )
{
_idx.release();
return;
}
if( _idx.kind() == _InputArray::MAT && !_idx.getMatRef().isContinuous() ) if( _idx.kind() == _InputArray::MAT && !_idx.getMatRef().isContinuous() )
_idx.release(); _idx.release();
_idx.create(n, 1, CV_32SC2); _idx.create(n, 1, CV_32SC2);

10
modules/core/test/test_arithm.cpp
View File

@ -1791,3 +1791,13 @@ INSTANTIATE_TEST_CASE_P(Arithm, SubtractOutputMatNotEmpty, testing::Combine(
testing::Values(perf::MatType(CV_8UC1), CV_8UC3, CV_8UC4, CV_16SC1, CV_16SC3), testing::Values(perf::MatType(CV_8UC1), CV_8UC3, CV_8UC4, CV_16SC1, CV_16SC3),
testing::Values(-1, CV_16S, CV_32S, CV_32F), testing::Values(-1, CV_16S, CV_32S, CV_32F),
testing::Bool())); testing::Bool()));
TEST(Core_FindNonZero, singular)
{
Mat img(10, 10, CV_8U, Scalar::all(0));
vector<Point> pts, pts2(10);
findNonZero(img, pts);
findNonZero(img, pts2);
ASSERT_TRUE(pts.empty() && pts2.empty());
}