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/modules/contrib/src/gencolors.cpp
+++ b/modules/contrib/src/gencolors.cpp
@@ -46,7 +46,7 @@

 using namespace cv;

-void downsamplePoints( const Mat& src, Mat& dst, size_t count )
+static void downsamplePoints( const Mat& src, Mat& dst, size_t count )
 {
    CV_Assert( count >= 2 );
    CV_Assert( src.cols == 1 || src.rows == 1 );