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
commit 103ee12f00

View File

@ -144,7 +144,7 @@ public:
virtual void reset(); virtual void reset();
virtual Mat nextFrame() { return nextStabilizedFrame(); } virtual Mat nextFrame() { return nextStabilizedFrame(); }
private: protected:
virtual void setUp(const Mat &firstFrame); virtual void setUp(const Mat &firstFrame);
virtual Mat estimateMotion(); virtual Mat estimateMotion();
virtual Mat estimateStabilizationMotion(); virtual Mat estimateStabilizationMotion();
@ -170,7 +170,7 @@ public:
virtual void reset(); virtual void reset();
virtual Mat nextFrame(); virtual Mat nextFrame();
private: protected:
void runPrePassIfNecessary(); void runPrePassIfNecessary();
virtual void setUp(const Mat &firstFrame); virtual void setUp(const Mat &firstFrame);