Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
2013-09-06 15:44:44 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
2012-06-15 13:04:17 +00:00 |
|
Vadim Pisarevsky
|
4eda1662aa
|
switched back to FitEllipse algorithm by Dr. Daniel Weiss; improved its accuracy in some cases. It fixes #1638
|
2012-03-29 10:47:08 +00:00 |
|
Vadim Pisarevsky
|
903c05db1a
|
added another contour perimeter test and fixed bug #216
|
2012-03-26 17:00:48 +00:00 |
|
Vadim Pisarevsky
|
22970b8270
|
fixed multiple GCC warnings on Ubuntu 11.04
|
2011-06-14 12:03:34 +00:00 |
|
Vadim Pisarevsky
|
061b49e0b2
|
reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.
|
2011-02-09 20:55:11 +00:00 |
|