Commit 3011e80f authored by Vladimir's avatar Vladimir

Merge pull request #2 from Auron-X/TLD_fixes_&_optimizations

Tld fixes & optimizations
parents 26f16e64 7569b8a1
...@@ -24,7 +24,6 @@ namespace cv{ ...@@ -24,7 +24,6 @@ namespace cv{
Mat_<double> HShist, Vhist; Mat_<double> HShist, Vhist;
}; };
TrackingHistogram _origHist; TrackingHistogram _origHist;
const TrackingFunctionPF & operator = (const TrackingFunctionPF &); const TrackingFunctionPF & operator = (const TrackingFunctionPF &);
}; };
......
...@@ -146,7 +146,6 @@ namespace cv ...@@ -146,7 +146,6 @@ namespace cv
Rect2d maxScRect; Rect2d maxScRect;
//Detection part //Detection part
//To fix: use precalculated BB
do do
{ {
Mat_<double> intImgP, intImgP2; Mat_<double> intImgP, intImgP2;
......
...@@ -70,7 +70,6 @@ namespace cv ...@@ -70,7 +70,6 @@ namespace cv
public: public:
TLDDetector(){} TLDDetector(){}
~TLDDetector(){} ~TLDDetector(){}
inline double ensembleClassifierNum(const uchar* data); inline double ensembleClassifierNum(const uchar* data);
inline void prepareClassifiers(int rowstep); inline void prepareClassifiers(int rowstep);
double Sr(const Mat_<uchar>& patch); double Sr(const Mat_<uchar>& patch);
......
...@@ -55,7 +55,6 @@ namespace cv ...@@ -55,7 +55,6 @@ namespace cv
measurements.assign(meas.begin() + beg, meas.begin() + end); measurements.assign(meas.begin() + beg, meas.begin() + end);
offset.assign(mpc, Point2i(0, 0)); offset.assign(mpc, Point2i(0, 0));
} }
// Calculate measure locations from 15x15 grid on minSize patches // Calculate measure locations from 15x15 grid on minSize patches
void TLDEnsembleClassifier::stepPrefSuff(std::vector<Vec4b>& arr, int pos, int len, int gridSize) void TLDEnsembleClassifier::stepPrefSuff(std::vector<Vec4b>& arr, int pos, int len, int gridSize)
{ {
......
...@@ -65,6 +65,5 @@ namespace cv ...@@ -65,6 +65,5 @@ namespace cv
int lastStep_; int lastStep_;
}; };
} }
} }
\ No newline at end of file
...@@ -64,7 +64,6 @@ namespace cv ...@@ -64,7 +64,6 @@ namespace cv
//Calculate the variance in initial BB //Calculate the variance in initial BB
originalVariance_ = variance(image(boundingBox)); originalVariance_ = variance(image(boundingBox));
//Find the scale //Find the scale
double scale = scaleAndBlur(image, cvRound(log(1.0 * boundingBox.width / (minSize.width)) / log(SCALE_STEP)), double scale = scaleAndBlur(image, cvRound(log(1.0 * boundingBox.width / (minSize.width)) / log(SCALE_STEP)),
scaledImg, blurredImg, GaussBlurKernelSize, SCALE_STEP); scaledImg, blurredImg, GaussBlurKernelSize, SCALE_STEP);
......
...@@ -53,7 +53,6 @@ namespace cv ...@@ -53,7 +53,6 @@ namespace cv
class TrackerTLDModel : public TrackerModel class TrackerTLDModel : public TrackerModel
{ {
public: public:
...@@ -75,7 +74,6 @@ namespace cv ...@@ -75,7 +74,6 @@ namespace cv
protected: protected:
Size minSize_; Size minSize_;
TrackerTLD::Params params_; TrackerTLD::Params params_;
void pushIntoModel(const Mat_<uchar>& example, bool positive); void pushIntoModel(const Mat_<uchar>& example, bool positive);
void modelEstimationImpl(const std::vector<Mat>& /*responses*/){} void modelEstimationImpl(const std::vector<Mat>& /*responses*/){}
......
...@@ -61,7 +61,6 @@ void TrackerTLD::Params::write(cv::FileStorage& /*fs*/) const {} ...@@ -61,7 +61,6 @@ void TrackerTLD::Params::write(cv::FileStorage& /*fs*/) const {}
namespace tld namespace tld
{ {
class TrackerProxy class TrackerProxy
{ {
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment