Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00
parent 73c152abc4
commit bd0e0b5800
438 changed files with 20374 additions and 19674 deletions
--- a/samples/gpu/performance/performance.cpp
+++ b/samples/gpu/performance/performance.cpp
@@ -144,7 +144,7 @@ string abspath(const string& relpath)
 }


-int CV_CDECL cvErrorCallback(int /*status*/, const char* /*func_name*/,
+static int CV_CDECL cvErrorCallback(int /*status*/, const char* /*func_name*/,
                             const char* err_msg, const char* /*file_name*/,
                             int /*line*/, void* /*userdata*/)
 {