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

removed trailing whitespaces

Browse Source
This commit is contained in:
lluis 2013-09-04 21:19:43 +02:00
parent b9a5e919e2
commit 04913f5af7
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/objdetect/src/erfilter.cpp
View File

@ -805,11 +805,15 @@ ERStat* ERFilterNM::er_tree_filter ( InputArray image, ERStat * stat, ERStat *pa
findContours( region, contours, hierarchy, RETR_TREE, CHAIN_APPROX_NONE, Point(0, 0) ); findContours( region, contours, hierarchy, RETR_TREE, CHAIN_APPROX_NONE, Point(0, 0) );
//TODO check epsilon parameter of approxPolyDP (set empirically) : we want more precission //TODO check epsilon parameter of approxPolyDP (set empirically) : we want more precission
// if the region is very small because otherwise we'll loose all the convexities // if the region is very small because otherwise we'll loose all the convexities
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
approxPolyDP( Mat(contours[0]), contour_poly, min(rect.width,rect.height)/17, true ); approxPolyDP( Mat(contours[0]), contour_poly, min(rect.width,rect.height)/17, true );
======= =======
approxPolyDP( Mat(contours[0]), contour_poly, (float)min(rect.width,rect.height)/17, true ); approxPolyDP( Mat(contours[0]), contour_poly, (float)min(rect.width,rect.height)/17, true );
>>>>>>> fixed a bug in the calculation of the number of inflexion points feature >>>>>>> fixed a bug in the calculation of the number of inflexion points feature
=======
approxPolyDP( Mat(contours[0]), contour_poly, (float)min(rect.width,rect.height)/17, true );
>>>>>>> removed trailing whitespaces
bool was_convex = false; bool was_convex = false;
@ -1130,7 +1134,10 @@ Ptr<ERFilter> createERFilterNM1(const Ptr<ERFilter::Callback>& cb, int threshold
======= =======
Ptr<ERFilterNM> filter = new ERFilterNM(); Ptr<ERFilterNM> filter = new ERFilterNM();
<<<<<<< HEAD
>>>>>>> fixed a bug in the non-max-suppression filter procedure >>>>>>> fixed a bug in the non-max-suppression filter procedure
=======
>>>>>>> removed trailing whitespaces
if (cb == NULL) if (cb == NULL)
filter->setCallback(makePtr<ERClassifierNM1>()); filter->setCallback(makePtr<ERClassifierNM1>());
else else
@ -1166,6 +1173,10 @@ Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb, float minProb
Ptr<ERFilterNM> filter = makePtr<ERFilterNM>(); Ptr<ERFilterNM> filter = makePtr<ERFilterNM>();
<<<<<<< HEAD
=======
>>>>>>> removed trailing whitespaces
if (cb == NULL) if (cb == NULL)
filter->setCallback(makePtr<ERClassifierNM2>()); filter->setCallback(makePtr<ERClassifierNM2>());
else else