merged 2.4 into trunk

2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
--- a/samples/cpp/segment_objects.cpp
+++ b/samples/cpp/segment_objects.cpp
@@ -87,7 +87,7 @@ int main(int argc, char** argv)
    namedWindow("segmented", 1);
    
    BackgroundSubtractorMOG bgsubtractor;
-    bgsubtractor.noiseSigma = 10;
+    bgsubtractor.set("noiseSigma", 10);
    
    for(;;)
    {