Merge branch '2.4'

2013-04-12 15:35:38 +04:00
parent b0933dd473 abe2ea59ed
commit 3b364330ad
75 changed files with 1259 additions and 3979 deletions
--- a/modules/core/test/test_io.cpp
+++ b/modules/core/test/test_io.cpp
@@ -455,7 +455,7 @@ protected:
 TEST(Core_InputOutput, huge) { CV_BigMatrixIOTest test; test.safe_run(); }
 */

-TEST(Core_globbing, accurasy)
+TEST(Core_globbing, accuracy)
 {
    std::string patternLena    = cvtest::TS::ptr()->get_data_path() + "lena*.*";
    std::string patternLenaPng = cvtest::TS::ptr()->get_data_path() + "lena.png";