From ef6a79244d4fef052687b0d5cf0abe6fce976622 Mon Sep 17 00:00:00 2001 From: Maria Dimashova Date: Fri, 8 Oct 2010 16:49:34 +0000 Subject: [PATCH] fixed compile error (with TBB) --- modules/features2d/src/evaluation.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/features2d/src/evaluation.cpp b/modules/features2d/src/evaluation.cpp index d440be5..c2ad098 100644 --- a/modules/features2d/src/evaluation.cpp +++ b/modules/features2d/src/evaluation.cpp @@ -211,6 +211,13 @@ struct IntersectAreaCounter const Scalar& _ellipse1, const Scalar& _ellipse2 ) : bua(0.f), bna(0.f), miny(_miny), maxy(_maxy), dr(_dr), diff(_diff), ellipse1(_ellipse1), ellipse2(_ellipse2) {} + IntersectAreaCounter( const IntersectAreaCounter& counter, Split ) + { + *this = counter; + bua = 0.f; + bna = 0.f; + } + void operator()( const BlockedRange& range ) { float temp_bua = bua, temp_bna = bna; @@ -231,6 +238,7 @@ struct IntersectAreaCounter bua = temp_bua; bna = temp_bna; } + void join( IntersectAreaCounter& ac ) { bua += ac.bua; -- 2.7.4