merged new master branch
authorErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Mon, 18 Aug 2014 13:29:45 +0000 (15:29 +0200)
committerErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Mon, 18 Aug 2014 13:29:45 +0000 (15:29 +0200)
commit6207d338ddf66c33d6524d9918b1c4ce2f031cd4
treef0eb43ffb82bf8332496973b4c5f0fc1cb8342f5
parentfae69df9a95e30f47ca0c358f12fe35fc7ce981e
merged new master branch
changed tests for tvl1 optflow
correction of a bug preventing compilation with cuda (fmin changed to fminf)
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudastereo/src/cuda/stereocsbp.cu
modules/video/test/test_tvl1optflow.cpp