Merge pull request #305 from stephenfalken:2.4

94e2b5c1 · Andrey Kamaev · OpenCV Buildbot · 7ad81ed4 · 195d501b · 94e2b5c1
Commit 94e2b5c1 authored Jan 24, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Jan 24, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

cascadedetect.cpp modules/objdetect/src/cascadedetect.cpp +2 -1

No files found.
--- a/modules/objdetect/src/cascadedetect.cpp
+++ b/modules/objdetect/src/cascadedetect.cpp
@@ -237,7 +237,7 @@ class MeanshiftGrouping
 {
 public:
    MeanshiftGrouping(const Point3d& densKer, const vector<Point3d>& posV,
-        const vector<double>& wV, double, int maxIter = 20)
+        const vector<double>& wV, double eps, int maxIter = 20)
    {
        densityKernel = densKer;
        weightsV = wV;
@@ -246,6 +246,7 @@ public:
        meanshiftV.resize(positionsCount);
        distanceV.resize(positionsCount);
        iterMax = maxIter;
+        modeEps = eps;

        for (unsigned i = 0; i<positionsV.size(); i++)
        {