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

Warning fixes continued

Browse Source
This commit is contained in:
Andrey Kamaev
2012-06-09 15:00:04 +00:00
parent f6b451c607
commit f2d3b9b4a1
127 changed files with 6298 additions and 6277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -636,12 +636,14 @@ struct CV_EXPORTS Feature
int label; ///< Quantization
Feature() : x(0), y(0), label(0) {}
Feature(int x, int y, int label) : x(x), y(y), label(label) {}
Feature(int x, int y, int label);
void read(const FileNode& fn);
void write(FileStorage& fs) const;
};
inline Feature::Feature(int _x, int _y, int _label) : x(_x), y(_y), label(_label) {}
struct CV_EXPORTS Template
{
int width;
@@ -688,10 +690,7 @@ protected:
/// Candidate feature with a score
struct Candidate
{
Candidate(int x, int y, int label, float score)
: f(x, y, label), score(score)
{
}
Candidate(int x, int y, int label, float score);
/// Sort candidates with high score to the front
bool operator<(const Candidate& rhs) const
@@ -716,6 +715,8 @@ protected:
size_t num_features, float distance);
};
inline QuantizedPyramid::Candidate::Candidate(int x, int y, int label, float _score) : f(x, y, label), score(_score) {}
/**
* \brief Interface for modalities that plug into the LINE template matching representation.
*
@@ -853,10 +854,7 @@ struct CV_EXPORTS Match
{
}
Match(int x, int y, float similarity, const std::string& class_id, int template_id)
: x(x), y(y), similarity(similarity), class_id(class_id), template_id(template_id)
{
}
Match(int x, int y, float similarity, const std::string& class_id, int template_id);
/// Sort matches with high similarity to the front
bool operator<(const Match& rhs) const
@@ -880,6 +878,11 @@ struct CV_EXPORTS Match
int template_id;
};
inline Match::Match(int _x, int _y, float _similarity, const std::string& _class_id, int _template_id)
: x(_x), y(_y), similarity(_similarity), class_id(_class_id), template_id(_template_id)
{
}
/**
* \brief Object detector using the LINE template matching algorithm with any set of
* modalities.