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

-void help()
+static void help()
 {
    cout << "\nThis program demonstrates line finding with the Hough transform.\n"
            "Usage:\n"