1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge pull request #845 from githubuser0xFFFF:master

This commit is contained in:
Vadim Pisarevsky
2013-05-12 12:54:44 +04:00
committed by OpenCV Buildbot
@@ -144,7 +144,7 @@ public:
virtual void reset();
virtual Mat nextFrame() { return nextStabilizedFrame(); }
private:
protected:
virtual void setUp(const Mat &firstFrame);
virtual Mat estimateMotion();
virtual Mat estimateStabilizationMotion();
@@ -170,7 +170,7 @@ public:
virtual void reset();
virtual Mat nextFrame();
private:
protected:
void runPrePassIfNecessary();
virtual void setUp(const Mat &firstFrame);