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/gpu/farneback_optical_flow.cpp
+++ b/samples/gpu/farneback_optical_flow.cpp
@@ -18,7 +18,7 @@ inline T mapVal(T x, T a, T b, T c, T d)
    return c + (d-c) * (x-a) / (b-a);
 }

-void colorizeFlow(const Mat &u, const Mat &v, Mat &dst)
+static void colorizeFlow(const Mat &u, const Mat &v, Mat &dst)
 {
    double uMin, uMax;
    minMaxLoc(u, &uMin, &uMax, 0, 0);