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
|
f21851f0f4
|
Boring changes - stitching.
|
11 years ago |
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
11 years ago |
Roman Donchenko
|
d9f71b762f
|
Deleted almost all of the precomp.cpp files.
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
|
11 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 |
Andrey Kamaev
|
a126532cb7
|
Fix OS X build warnings
|
12 years ago |
marina.kolpakova
|
7a5b9a6b7f
|
replase __APPLE__ marco with __clang__
|
12 years ago |
Andrey Kamaev
|
2b0072d823
|
Suppress more warnings in gtest on OS X
|
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
|
06a13d9ba0
|
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
|
12 years ago |
Andrey Kamaev
|
e900952b87
|
quiet most of the OSX build warnings
|
13 years ago |
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
13 years ago |
Andrey Kamaev
|
47a4e87784
|
Ignored warnings from gtest with precompiled headers enabled
|
13 years ago |
Andrey Kamaev
|
2f40905548
|
Fixed Android build
|
13 years ago |
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
13 years ago |
Andrey Kamaev
|
11ce8683bb
|
Fixed stitching module tests built without nonfree
|
13 years ago |
Alexey Spizhevoy
|
d8fa374167
|
Fixed the multi-band blending test
|
13 years ago |
Alexey Spizhevoy
|
c09eae4969
|
Updated the multi-band blending test
|
13 years ago |
Alexey Spizhevoy
|
7ddb706b29
|
Added a test for the multi-band blender
|
13 years ago |
Alexey Spizhevoy
|
e99b090871
|
Fixed bug in ROI based features finder (stitching)
|
13 years ago |