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
|
11 years ago |
Roman Donchenko
|
beeb932d22
|
Boring changes - highgui.
|
11 years ago |
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
12 years ago |
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
12 years ago |
Vadim Pisarevsky
|
fbe0d6963c
|
disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW
|
12 years ago |
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
12 years ago |
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
12 years ago |
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
13 years ago |
Vadim Pisarevsky
|
2c88791600
|
get back to single-version ffmpeg wrapper (no more v2); make sure the library builds and the tests pass on Ubuntu 10.04 that includes pretty old version of ffmpeg
|
13 years ago |
Andrey Kamaev
|
b93d3d7a55
|
Fixed build warnings
|
13 years ago |
Vadim Pisarevsky
|
562e404224
|
fixed HighguiFramecount.regression test (and renamed it to Highgui_Video.framecount)
|
13 years ago |
Andrey Kamaev
|
2bedf5bfd5
|
Refactored build conditionals in highgui tests
|
13 years ago |
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
13 years ago |
Vadim Pisarevsky
|
b253665f8c
|
added explicit VideoWriter::release(). Fixed video stream finalization (write remaining frames); Fixed occasional crash in the case of odd-width or odd-height videos; Fixed a few problems in ffmpeg tests. Positioning still does not work well.
|
13 years ago |
Alexander Shishkov
|
fc68c18c92
|
unrolled changes from r7601 (problems with Android,...)
|
13 years ago |
Alexander Reshetnikov
|
ce8c2892d8
|
Removed OS conditions from highgui tests
|
13 years ago |
Alexander Reshetnikov
|
deee349ba7
|
removed highgui video tests execution on macos; also minor code changes
|
13 years ago |
Alexander Reshetnikov
|
35c19442a7
|
updated 3 highgui tests
|
13 years ago |
Alexander Reshetnikov
|
6ead21b1a2
|
added licenses to some tests; updated new highgui tests
|
13 years ago |
Alexander Reshetnikov
|
b4895dbcaf
|
completed tests checking positioning & frame count for videos (C interface); added new test videos
|
13 years ago |