Commit f60726b0 authored by E Braun's avatar E Braun Committed by Vadim Pisarevsky

Revert "fix for bug 3172"

This reverts commit ed2cdb71.
parent 1675b23a
...@@ -2463,7 +2463,7 @@ struct BatchDistInvoker : public ParallelLoopBody ...@@ -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, ...@@ -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() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment