Merge branch '2.4'

2013-04-05 19:52:42 +04:00
parent 3785439917 74e5ff2ec7
commit 67073daf19
154 changed files with 11355 additions and 16795 deletions
--- a/samples/gpu/super_resolution.cpp
+++ b/samples/gpu/super_resolution.cpp
@@ -48,8 +48,7 @@ static Ptr<DenseOpticalFlowExt> createOptFlow(const string& name, bool useGpu)
    {
        cerr << "Incorrect Optical Flow algorithm - " << name << endl;
    }
-
-    return Ptr<DenseOpticalFlowExt>();
+    return 0;
 }

 int main(int argc, const char* argv[])