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

replace cv::Mat to Input/Output arrays

Browse Source
This commit is contained in:
marina.kolpakova 2013-01-09 16:46:21 +04:00
parent 184ae44dea
commit e7bab669fa
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sft/fpool.cpp
View File

@ -54,7 +54,7 @@ sft::ICFFeaturePool::ICFFeaturePool(cv::Size m, int n) : FeaturePool(), model(m)
fill(nfeatures); fill(nfeatures);
} }
void sft::ICFFeaturePool::preprocess(const Mat& frame, Mat& integrals) const void sft::ICFFeaturePool::preprocess(cv::InputArray frame, cv::OutputArray integrals) const
{ {
preprocessor.apply(frame, integrals); preprocessor.apply(frame, integrals);
} }

9
apps/sft/include/sft/fpool.hpp
View File

@ -56,9 +56,12 @@ class Preprocessor
public: public:
Preprocessor() {} Preprocessor() {}
void apply(const cv::Mat& frame, cv::Mat& integrals) const void apply(cv::InputArray _frame, cv::OutputArray _integrals) const //const cv::Mat& frame, cv::Mat& integrals
{ {
CV_Assert(frame.type() == CV_8UC3); CV_Assert(_frame.type() == CV_8UC3);
cv::Mat frame = _frame.getMat();
cv::Mat& integrals = _integrals.getMatRef();
int h = frame.rows; int h = frame.rows;
int w = frame.cols; int w = frame.cols;
@ -165,7 +168,7 @@ public:
virtual int size() const { return (int)pool.size(); } virtual int size() const { return (int)pool.size(); }
virtual float apply(int fi, int si, const cv::Mat& integrals) const; virtual float apply(int fi, int si, const cv::Mat& integrals) const;
virtual void preprocess(const cv::Mat& frame, cv::Mat& integrals) const; virtual void preprocess(cv::InputArray _frame, cv::OutputArray _integrals) const;
virtual void write( cv::FileStorage& fs, int index) const; virtual void write( cv::FileStorage& fs, int index) const;
virtual ~ICFFeaturePool(); virtual ~ICFFeaturePool();

2
modules/ml/include/opencv2/ml/ml.hpp
View File

@ -2140,7 +2140,7 @@ public:
virtual float apply(int fi, int si, const Mat& integrals) const = 0; virtual float apply(int fi, int si, const Mat& integrals) const = 0;
virtual void write( cv::FileStorage& fs, int index) const = 0; virtual void write( cv::FileStorage& fs, int index) const = 0;
virtual void preprocess(const Mat& frame, Mat& integrals) const = 0; virtual void preprocess(InputArray frame, OutputArray integrals) const = 0;
virtual ~FeaturePool(); virtual ~FeaturePool();
}; };