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

fixed a few problems detected by Xcode 4.2.1

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-02-15 19:48:04 +00:00
parent ada6ab3778
commit 716a5d04ab
15 changed files with 34 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
View File

@@ -470,11 +470,12 @@ protected:
Ptr<CvHaarClassifierCascade> oldCascade;
public:
class MaskGenerator
class CV_EXPORTS MaskGenerator
{
public:
virtual cv::Mat generateMask(const cv::Mat& src)=0;
virtual void initializeMask(const cv::Mat& /*src*/) {};
public:
virtual ~MaskGenerator() {}
virtual cv::Mat generateMask(const cv::Mat& src)=0;
virtual void initializeMask(const cv::Mat& /*src*/) {};
};
void setMaskGenerator(Ptr<MaskGenerator> maskGenerator);
Ptr<MaskGenerator> getMaskGenerator();

5
modules/objdetect/src/cascadedetect.cpp
View File

@@ -170,7 +170,7 @@ class MeanshiftGrouping
{
public:
MeanshiftGrouping(const Point3d& densKer, const vector<Point3d>& posV,
const vector<double>& wV, double modeEps = 1e-4, int maxIter = 20)
const vector<double>& wV, double, int maxIter = 20)
{
densityKernel = densKer;
weightsV = wV;
@@ -178,15 +178,12 @@ public:
positionsCount = (int)posV.size();
meanshiftV.resize(positionsCount);
distanceV.resize(positionsCount);
modeEps = modeEps;
iterMax = maxIter;
for (unsigned i = 0; i<positionsV.size(); i++)
{
meanshiftV[i] = getNewValue(positionsV[i]);
distanceV[i] = moveToMode(meanshiftV[i]);
meanshiftV[i] -= positionsV[i];
}
}