From ed2cdb71e5821db85b57cf60d88689c2bf32aeeb Mon Sep 17 00:00:00 2001 From: E Braun Date: Fri, 1 Aug 2014 00:17:56 +0200 Subject: [PATCH] fix for bug 3172 --- modules/core/src/stat.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp index 8ad2aab..cafdf0f 100644 --- a/modules/core/src/stat.cpp +++ b/modules/core/src/stat.cpp @@ -2463,7 +2463,7 @@ struct BatchDistInvoker : public ParallelLoopBody } void cv::batchDistance( InputArray _src1, InputArray _src2, - OutputArray _dist, int dtype, OutputArray _nidx, + InputOutputArray _dist, int dtype, InputOutputArray _nidx, int normType, int K, InputArray _mask, int update, bool crosscheck ) { @@ -2479,8 +2479,6 @@ void cv::batchDistance( InputArray _src1, InputArray _src2, } 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); Mat dist = _dist.getMat(), nidx; if( _nidx.needed() ) -- 2.7.4