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

fixed compile error (with TBB)

Browse Source
This commit is contained in:
Maria Dimashova 2010-10-08 16:49:34 +00:00
parent 9f934363e5
commit ef6a79244d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/features2d/src/evaluation.cpp
View File

@ -211,6 +211,13 @@ struct IntersectAreaCounter
const Scalar& _ellipse1, const Scalar& _ellipse2 ) : bua(0.f), bna(0.f), const Scalar& _ellipse1, const Scalar& _ellipse2 ) : bua(0.f), bna(0.f),
miny(_miny), maxy(_maxy), dr(_dr), diff(_diff), miny(_miny), maxy(_maxy), dr(_dr), diff(_diff),
ellipse1(_ellipse1), ellipse2(_ellipse2) {} ellipse1(_ellipse1), ellipse2(_ellipse2) {}
IntersectAreaCounter( const IntersectAreaCounter& counter, Split )
{
*this = counter;
bua = 0.f;
bna = 0.f;
}
void operator()( const BlockedRange& range ) void operator()( const BlockedRange& range )
{ {
float temp_bua = bua, temp_bna = bna; float temp_bua = bua, temp_bna = bna;
@ -231,6 +238,7 @@ struct IntersectAreaCounter
bua = temp_bua; bua = temp_bua;
bna = temp_bna; bna = temp_bna;
} }
void join( IntersectAreaCounter& ac ) void join( IntersectAreaCounter& ac )
{ {
bua += ac.bua; bua += ac.bua;