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
|
9b92545ce6
|
War on Whitespace, master edition: trailing spaces.
|
2013-08-27 13:57:24 +04:00 |
|
Vadim Pisarevsky
|
8a6d2bbd3d
|
several minor fixes proposed by Andrey
|
2013-03-03 00:54:46 +04:00 |
|
Vadim Pisarevsky
|
374e3a0890
|
rewritten several functions from calib3d: findhomography, findfundamentalmat, findessentialmat, estimateaffine3d, computecorrespondepilines, convert points{to/from}homogeneous to C++.
|
2013-02-28 18:25:05 +04:00 |
|