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

Revert "fix for bug 3172"

Browse Source 
This reverts commit ed2cdb71e5821db85b57cf60d88689c2bf32aeeb.
This commit is contained in:
E Braun 2014-09-02 13:56:13 +02:00 committed by Vadim Pisarevsky
parent 1675b23a64
commit f60726b090
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2463,7 +2463,7 @@ struct BatchDistInvoker : public ParallelLoopBody
} }
void cv::batchDistance( InputArray _src1, InputArray _src2, void cv::batchDistance( InputArray _src1, InputArray _src2,
InputOutputArray _dist, int dtype, InputOutputArray _nidx, OutputArray _dist, int dtype, OutputArray _nidx,
int normType, int K, InputArray _mask, int normType, int K, InputArray _mask,
int update, bool crosscheck ) int update, bool crosscheck )
{ {
@ -2479,6 +2479,8 @@ void cv::batchDistance( InputArray _src1, InputArray _src2,
} }
CV_Assert( (type == CV_8U && dtype == CV_32S) || dtype == CV_32F); CV_Assert( (type == CV_8U && dtype == CV_32S) || dtype == CV_32F);
K = std::min(K, src2.rows);
_dist.create(src1.rows, (K > 0 ? K : src2.rows), dtype); _dist.create(src1.rows, (K > 0 ? K : src2.rows), dtype);
Mat dist = _dist.getMat(), nidx; Mat dist = _dist.getMat(), nidx;
if( _nidx.needed() ) if( _nidx.needed() )