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

-void help()
+static void help()
 {
    cout << "\nThis program demonstrates the cascade recognizer. Now you can use Haar or LBP features.\n"
            "This classifier can recognize many ~rigid objects, it's most known use is for faces.\n"