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 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Vadim Pisarevsky
|
06a13d9ba0
|
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
|
2012-10-02 23:07:46 +04:00 |
|
Andrey Kamaev
|
2f40905548
|
Fixed Android build
|
2012-06-08 08:11:17 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Alexey Spizhevoy
|
7ddb706b29
|
Added a test for the multi-band blender
|
2012-01-30 10:31:10 +00:00 |
|
Alexey Spizhevoy
|
e99b090871
|
Fixed bug in ROI based features finder (stitching)
|
2011-09-26 13:17:06 +00:00 |
|