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

fixed rebase conflicts

Browse Source
This commit is contained in:
lluis 2013-09-06 14:00:11 +02:00
parent 512111af9c
commit 6ef1d456dd
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/objdetect/include/opencv2/objdetect/erfilter.hpp
View File

@ -190,13 +190,8 @@ CV_EXPORTS Ptr<ERFilter> createERFilterNM1(const Ptr<ERFilter::Callback>& cb = P
if omitted tries to load a default classifier from file trained_classifierNM2.xml if omitted tries to load a default classifier from file trained_classifierNM2.xml
\param minProbability The minimum probability P(er|character) allowed for retreived ER's \param minProbability The minimum probability P(er|character) allowed for retreived ER's
*/ */
<<<<<<< HEAD
CV_EXPORTS Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb = Ptr<ERFilter::Callback>(), CV_EXPORTS Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb = Ptr<ERFilter::Callback>(),
float minProbability = 0.85);
=======
CV_EXPORTS Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb = NULL,
float minProbability = 0.5); float minProbability = 0.5);
>>>>>>> fixed a typo error in the default min_Probability param of CreateERFilterNM2
} }
#endif // _OPENCV_ERFILTER_HPP_ #endif // _OPENCV_ERFILTER_HPP_

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

@ -783,16 +783,7 @@ 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
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
=======
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;
int num_inflexion_points = 0; int num_inflexion_points = 0;
@ -1106,16 +1097,8 @@ Ptr<ERFilter> createERFilterNM1(const Ptr<ERFilter::Callback>& cb, int threshold
CV_Assert( (thresholdDelta >= 0) && (thresholdDelta <= 128) ); CV_Assert( (thresholdDelta >= 0) && (thresholdDelta <= 128) );
CV_Assert( (minProbabilityDiff >= 0.) && (minProbabilityDiff <= 1.) ); CV_Assert( (minProbabilityDiff >= 0.) && (minProbabilityDiff <= 1.) );
<<<<<<< HEAD
Ptr<ERFilterNM> filter = makePtr<ERFilterNM>(); Ptr<ERFilterNM> filter = makePtr<ERFilterNM>();
=======
Ptr<ERFilterNM> filter = new ERFilterNM();
<<<<<<< HEAD
>>>>>>> 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
@ -1150,11 +1133,6 @@ 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