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 |
|
Andrey Kamaev
|
8f32902ce6
|
Minimize usages of legacy C API inside the library
|
2013-04-16 12:00:02 +04:00 |
|
Andrey Kamaev
|
199a35a105
|
Move C API of opencv_video to separate file
|
2013-04-11 17:38:33 +04:00 |
|
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
2012-10-17 15:57:49 +04:00 |
|
Vadim Pisarevsky
|
427ce1247a
|
some bugfixes & improvements in openfabmap code, docs and samples by Arren Glover
|
2012-09-23 20:57:34 +04:00 |
|
Vadim Pisarevsky
|
67ff95083d
|
added openfabmap code, contributed by Arren Glover. fixed several warnings in the new versions of retina filters
|
2012-09-03 17:03:31 +04:00 |
|