Merge branch 'master' into tvl1_ali

2014-07-01 10:17:07 +02:00
parent 5101a7fc00 2d81595ed4
commit c45e645d6c
682 changed files with 72006 additions and 154976 deletions
--- a/modules/video/src/tvl1flow.cpp
+++ b/modules/video/src/tvl1flow.cpp
@@ -361,7 +361,9 @@ OpticalFlowDual_TVL1::OpticalFlowDual_TVL1()

 void OpticalFlowDual_TVL1::calc(InputArray _I0, InputArray _I1, InputOutputArray _flow)
 {
-    CV_OCL_RUN(_flow.isUMat(), calc_ocl(_I0, _I1, _flow))
+    CV_OCL_RUN(_flow.isUMat() &&
+               ocl::Image2D::isFormatSupported(CV_32F, 1, false),
+               calc_ocl(_I0, _I1, _flow))

    Mat I0 = _I0.getMat();
    Mat I1 = _I1.getMat();