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/one_way_sample.cpp
+++ b/samples/c/one_way_sample.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <stdio.h>

-void help()
+static void help()
 {
 	printf("\nThis program demonstrates the one way interest point descriptor found in features2d.hpp\n"
 			"Correspondences are drawn\n");