merged 2.4 into trunk

This commit is contained in:
Vadim Pisarevsky
2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions

View File

@@ -404,11 +404,11 @@ Updates the predicted state from the measurement.
BackgroundSubtractor
--------------------
.. ocv:class:: BackgroundSubtractor
.. ocv:class:: BackgroundSubtractor : public Algorithm
Base class for background/foreground segmentation. ::
class BackgroundSubtractor
class BackgroundSubtractor : public Algorithm
{
public:
virtual ~BackgroundSubtractor();