Merge branch '2.4'

2013-01-25 16:30:36 +04:00
parent 0487067964 d8f749da52
commit f4e27bcbbc
105 changed files with 4821 additions and 2883 deletions
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -439,7 +439,7 @@ void error( const Exception& exc )
            exc.func.c_str() : "unknown function", exc.file.c_str(), exc.line );
        fprintf( stderr, "%s\n", buf );
        fflush( stderr );
-#  ifdef ANDROID
+#  ifdef __ANDROID__
        __android_log_print(ANDROID_LOG_ERROR, "cv::error()", "%s", buf);
 #  endif
    }