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/modules/legacy/test/test_pyrsegmentation.cpp
+++ b/modules/legacy/test/test_pyrsegmentation.cpp
@@ -199,6 +199,6 @@ _exit_:
        ts->set_failed_test_info( code );
 }

-TEST(Imgproc_PyrSegmentation, regression) { CV_PyrSegmentationTest test; test.safe_run(); }
+TEST(Legacy_PyrSegmentation, regression) { CV_PyrSegmentationTest test; test.safe_run(); }

 /* End of file. */