mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-16 18:39:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,224 Commits 6 Branches 127 Tags 3 GiB
daefe6983f
Commit Graph

11224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Donchenko
3f3ae33327 Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp. 
This should actually remove the need for the workaround from
the previous commit.
 2013-10-23 14:56:37 +04:00
Roman Donchenko
eb86d37b26 Removed some dubious FFmpeg hack that no longer works. 2013-10-23 14:56:37 +04:00
Roman Donchenko
66beb44286 Applied a change from 555c505b to 3rdparty/tbb/CMakeLists.txt. 
Odd that it wasn't merged automatically...
 2013-10-23 14:56:37 +04:00
Roman Donchenko
6dda2652cd Merge pull request #1659 from ilya-lavrenov:ocl_examples 2013-10-23 14:50:56 +04:00
Vadim Pisarevsky
5a34272150 fixed build on Windows 2013-10-23 00:17:18 +04:00
Vadim Pisarevsky
de521fc9fa fixed some more compile bugs (including Python bindings) 2013-10-22 23:34:16 +04:00
Roman Donchenko
bb461fab34 Merge pull request #1649 from asandwhich:2.4 2013-10-22 19:16:09 +04:00
Roman Donchenko
a549621aac Merge pull request #1666 from SpecLad:cv-cap-openni 2013-10-22 19:02:48 +04:00
Roman Donchenko
f82eb0f79c Add better OpenMP detection and make an option to enable it. 
Bug report and inspiration: http://code.opencv.org/issues/3328
 2013-10-22 18:47:37 +04:00
Vadim Pisarevsky
d3076c5014 hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors 2013-10-22 17:41:28 +04:00
Roman Donchenko
e384a7bb95 Merge pull request #1665 from SpecLad:cuda-min-ver 2013-10-22 16:44:09 +04:00
Roman Donchenko
779acfa715 Suppressed -Wundef in bioinspired, because of OpenCL headers. 2013-10-22 15:16:22 +04:00
Roman Donchenko
8ff267cbac Fixed incorrectly unprefixed constant names in the OpenNI tutorial. 
Bug report: http://code.opencv.org/issues/3329
 2013-10-22 14:48:25 +04:00
Roman Donchenko
49c6533227 Move the minimal CUDA version into the minimal version list. 2013-10-22 14:32:13 +04:00
Roman Donchenko
4036f6a3d0 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	apps/CMakeLists.txt
	modules/contrib/CMakeLists.txt
	modules/core/include/opencv2/core/version.hpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_imgproc.cpp
	samples/gpu/CMakeLists.txt
 2013-10-22 14:28:00 +04:00
Vadim Pisarevsky
d8c8339bec the first draft of transparent API and new UMat class. more files 2013-10-22 14:05:15 +04:00
Vadim Pisarevsky
278fb617d2 the first draft of transparent API and new UMat class. 2013-10-22 14:04:49 +04:00
Roman Donchenko
6640846e95 Merge pull request #1653 from jlblancoc:master 2013-10-22 13:53:12 +04:00
Andrey Pavlenko
1e8b72f8c0 Merge pull request #1658 from alalek:ocl_fixes 2013-10-22 13:46:54 +04:00
Roman Donchenko
1e556e08dc Merge pull request #1661 from look4pritam:my-branch 2013-10-22 13:45:25 +04:00
look4pritam
8c121d372a Small OpenCV-CUDA bugs are fixed. 2013-10-22 12:08:43 +05:30
Ilya Lavrenov
4d86e2140d OpenCL examples refactoring 2013-10-21 23:50:54 +04:00
Jose-Luis Blanco-Claraco
80e667b647 Minimized the number of arguments required to workaround the MSVC2013 compiler bug. 2013-10-21 21:43:26 +02:00
Jose-Luis Blanco-Claraco
27b02921f3 Added patch file for fixing VS2013 in 3rd party lib OpenEXR 2013-10-21 21:41:27 +02:00
Jose-Luis Blanco-Claraco
77023e2366 Added comment to features2d_init.cpp explaining the reason for the extra parameters. 2013-10-21 21:17:15 +02:00
Alexander Alekhin
e7fd053478 ocl: fix FFT initialization 2013-10-21 19:48:36 +04:00
Alexander Alekhin
9acca12d2d ocl: workaround for ProgramCache cleanup issue, use RAII to print kernel build error 2013-10-21 19:16:33 +04:00
Jose-Luis Blanco-Claraco
c33ca77838 Undo changing whitespace. 2013-10-21 15:59:26 +02:00
Jose-Luis Blanco-Claraco
bec35eeddb Avoid duplicated variable declarations. 2013-10-21 15:57:11 +02:00
Greg Hale
387587f4f0 regex doesnt need to match full length of input, so only trying to match the leading -[lL] 2013-10-21 09:27:04 -04:00
Roman Donchenko
a54d36bde8 Merge pull request #1646 from alalek:ocl_fix_msvc11 2013-10-21 16:53:24 +04:00
Roman Donchenko
29f37fc130 Merge pull request #1575 from jet47:gpu-buffer-pool 2013-10-21 16:35:14 +04:00
Roman Donchenko
21233656bd Merge pull request #1540 from jet47:gpuarithm-cudev 2013-10-21 16:34:45 +04:00
Roman Donchenko
e290436a4c Merge pull request #1492 from jet47:gpucodec-cudev 2013-10-21 16:30:15 +04:00
Roman Donchenko
f25b77ff1e Merge pull request #1534 from jet47:fix-cuda-5.0-build 2013-10-21 16:29:37 +04:00
Roman Donchenko
bfd8acbbc3 Merge pull request #1556 from jet47:fix-bug-3296 2013-10-21 16:28:00 +04:00
Roman Donchenko
9bc347c848 Merge pull request #1650 from jet47:fix-gpu-bgsegm-sample 2013-10-21 16:18:02 +04:00
Andrey Pavlenko
aec7d9c1db Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative 2013-10-21 16:06:36 +04:00
Andrey Pavlenko
0ad04d66e3 Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix 2013-10-21 16:00:13 +04:00
Andrey Pavlenko
e82fd12a67 Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations 2013-10-21 15:59:19 +04:00
Andrey Pavlenko
bd1a1cc031 Merge pull request #1633 from ilya-lavrenov:ocl_imgproc 2013-10-21 15:59:00 +04:00
Ilya Lavrenov
9d923b50ac fixed ocl::Laplacian for case when scale != 1 2013-10-21 14:27:34 +04:00
Ilya Lavrenov
6085c416a7 missed initialization of kernel size 2013-10-21 14:27:14 +04:00
Roman Donchenko
599d51ec14 Merge pull request #1651 from ilya-lavrenov:misprint 2013-10-21 14:00:23 +04:00
peng xiao
7285341083 1. Let btvRegWeights to be constant per process call. 
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
 2013-10-21 10:21:37 +08:00
Jose-Luis Blanco-Claraco
52a904e17b Fixed MSVC 2013 build errors and workaround for an internal compiler crash. 2013-10-20 17:28:45 +02:00
Nghia Ho
2238e711b5 Copied errorCovPre to errorCovPost. This allows the correct behaviour of the uncertainty to grow when there is missing data for each predict step. 2013-10-20 13:00:11 +11:00
Greg Hale
fe3dd762a4 fixed wrong regex 2013-10-19 17:30:32 -04:00
Ilya Lavrenov
4f68f35a78 added reflect, reflect101, replicate, wrap border types to ocl::remap 2013-10-19 23:38:50 +04:00
Ilya Lavrenov
bebc1c9330 misprint 2013-10-19 22:59:47 +04:00