Merged the trunk till r8291

2012-05-18 12:18:17 +00:00
parent caddd398e6
commit 50ad690993
25 changed files with 143 additions and 64 deletions
--- a/samples/gpu/brox_optical_flow.cpp
+++ b/samples/gpu/brox_optical_flow.cpp
@@ -215,7 +215,7 @@ int main(int argc, const char* argv[])
            switch (key)
            {
            case 27:
-                break;
+                return 0;

            case 'A':
                if (currentFrame > 0) 
@@ -243,8 +243,6 @@ int main(int argc, const char* argv[])
        cerr << "Unknow error" << endl;
        return -1;
    }
-
-    return 0;
 }

 template <typename T> inline T clamp (T x, T a, T b)