Ilya Lavrenov
|
6b9ebcbf3d
|
deleted extra semicolons
|
12 years ago |
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
|
12 years ago |
Roman Donchenko
|
24dee16b12
|
Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.
Also changed the static functions to inline, to stop GCC complaining
about unused functions.
|
12 years ago |
Vadim Pisarevsky
|
07e0f7bf59
|
refactored video module; use the new-style algorithms now
|
12 years ago |
Andrey Kamaev
|
7b5a45eac4
|
Merged the trunk r8384:8407 (inclusive)
|
13 years ago |
Vadim Pisarevsky
|
fd68cc768a
|
fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876)
|
13 years ago |
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
13 years ago |
Vladislav Vinogradov
|
f4b4665940
|
added VideoReader_GPU
|
13 years ago |
Alexey Spizhevoy
|
23636433d7
|
Updated bundle adjustment in stitching module: 1) it minimizes reprojection error now, 2) it minimizes error over focal, aspect, p.p.x, p.p.y parameters. Refactored and updated warpers.
|
14 years ago |
Alexey Spizhevoy
|
c9a41c6802
|
added first version of public stitching API, added simple sample which uses that API, old sample renamed to stitching_detailed
|
14 years ago |
Alexey Spizhevoy
|
95a3ffd0c5
|
put all old stitching API into detail namespace
|
14 years ago |
Alexey Spizhevoy
|
b0fe660d5b
|
fixed stitching module link error on Windows
|
14 years ago |
Alexey Spizhevoy
|
9be4701f24
|
turned opencv_stitching application to module and sample
|
14 years ago |
Alexey Spizhevoy
|
78bb392088
|
refactored opencv_stitching
|
14 years ago |
Alexey Spizhevoy
|
ee18397f58
|
added CameraInfo class into opencv_stitching
|
14 years ago |
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
15 years ago |