Merge branch '2.4'

2013-02-18 15:35:42 +04:00
parent ec7a7c0f7c 7e5eee5bf1
commit 262fc929aa
88 changed files with 3608 additions and 1346 deletions
--- a/samples/cpp/tvl1_optical_flow.cpp
+++ b/samples/cpp/tvl1_optical_flow.cpp
@@ -173,10 +173,10 @@ int main(int argc, const char* argv[])
    }

    Mat_<Point2f> flow;
-    OpticalFlowDual_TVL1 tvl1;
+    Ptr<DenseOpticalFlow> tvl1 = createOptFlow_DualTVL1();

    const double start = (double)getTickCount();
-    tvl1(frame0, frame1, flow);
+    tvl1->calc(frame0, frame1, flow);
    const double timeSec = (getTickCount() - start) / getTickFrequency();
    cout << "calcOpticalFlowDual_TVL1 : " << timeSec << " sec" << endl;