Merged the trunk r8589:8653 - all changes related to build warnings

samples/cpp/convexhull.cpp

@@ -6,11 +6,11 @@
 using namespace cv;
 using namespace std;
 
-void help()
+static void help()
 {
-	cout << "\nThis sample program demonstrates the use of the convexHull() function\n"
-		 << "Call:\n"
-		 << "./convexhull\n" << endl;
+    cout << "\nThis sample program demonstrates the use of the convexHull() function\n"
+         << "Call:\n"
+         << "./convexhull\n" << endl;
 }
 
 int main( int /*argc*/, char** /*argv*/ )
@@ -24,7 +24,7 @@ int main( int /*argc*/, char** /*argv*/ )
     {
         char key;
         int i, count = (unsigned)rng%100 + 1;
-        
+
         vector<Point> points;
 
         for( i = 0; i < count; i++ )
@@ -32,20 +32,20 @@ int main( int /*argc*/, char** /*argv*/ )
             Point pt;
             pt.x = rng.uniform(img.cols/4, img.cols*3/4);
             pt.y = rng.uniform(img.rows/4, img.rows*3/4);
-            
+
             points.push_back(pt);
         }
-        
+
         vector<int> hull;
         convexHull(Mat(points), hull, true);
-        
+
         img = Scalar::all(0);
         for( i = 0; i < count; i++ )
             circle(img, points[i], 3, Scalar(0, 0, 255), CV_FILLED, CV_AA);
-        
+
         int hullcount = (int)hull.size();
         Point pt0 = points[hull[hullcount-1]];
-        
+
         for( i = 0; i < hullcount; i++ )
         {
             Point pt = points[hull[i]];