Roman Donchenko
|
3d7a457c97
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
|
2014-05-19 18:39:20 +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 |
|
look4pritam
|
8c121d372a
|
Small OpenCV-CUDA bugs are fixed.
|
2013-10-22 12:08:43 +05:30 |
|
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 |
|
Vladislav Vinogradov
|
f46b7fcf86
|
fixed warnings in resize.cu
|
2013-09-04 11:15:18 +04:00 |
|
Vladislav Vinogradov
|
429bfad225
|
removed precomp.cpp files
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
cbe437571e
|
fixed docs
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
fd88654b45
|
replaced GPU -> CUDA
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
3c34b24f1f
|
replaced gpu->cuda in files names
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
d4901a99ea
|
renamed gpuwarping -> cudawarping
|
2013-09-02 14:00:42 +04:00 |
|