Vladislav Vinogradov
|
48c9c24da6
|
disable -Wshadow warning for CUDA modules:
it is generated by CUDA headers and we can't fix it
|
2014-12-22 11:48:19 +03:00 |
|
Alexander Alekhin
|
55188fe991
|
world fix
|
2014-08-05 20:12:35 +04:00 |
|
Vladislav Vinogradov
|
ba706177cb
|
fix cudacodec module dependecies
|
2014-07-28 12:13:52 +04:00 |
|
vbystricky
|
d58f736935
|
Split highgui module to videoio and highgui
|
2014-07-14 23:16:47 +04:00 |
|
Andrey Pavlenko
|
724f5e7f19
|
Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them)
|
2014-06-16 11:18:52 +04:00 |
|
Roman Donchenko
|
d58cd9851f
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
|
2013-12-03 17:35:21 +04:00 |
|
Vladislav Vinogradov
|
776c0cb08c
|
switched to new device layer in gpucodec module
|
2013-09-23 12:16:57 +04:00 |
|
Vladislav Vinogradov
|
dbeb3e2968
|
renamed gpucodec -> cudacodec
|
2013-09-02 14:00:42 +04:00 |
|