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/cpp/multicascadeclassifier.cpp
+++ b/samples/cpp/multicascadeclassifier.cpp
@@ -10,7 +10,7 @@
 using namespace std;
 using namespace cv;

-void help()
+static void help()
 {
    cout << "\nThis program demonstrates the multi cascade recognizer. It is a generalization of facedetect sample.\n\n"
            "Usage: ./multicascadeclassifier \n"