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 |
|
Vladislav Vinogradov
|
5673e7e435
|
fix bug in gpu bgsegm sample
create `d_fgimg` matrix before cleaning.
|
2013-10-19 12:40:10 +04:00 |
|
Vladislav Vinogradov
|
29386f1449
|
renamed gpubgsegm -> cudabgsegm
|
2013-09-02 14:00:43 +04:00 |
|
Vladislav Vinogradov
|
91dd44e7fa
|
removed compatibility headers
|
2013-09-02 14:00:42 +04:00 |
|
Vladislav Vinogradov
|
e895b7455e
|
renamed gpu namespace -> cuda
|
2013-09-02 14:00:41 +04:00 |
|
Vladislav Vinogradov
|
62edeeed16
|
refactored FGD algorithm
|
2013-07-18 15:39:42 +04:00 |
|
Vladislav Vinogradov
|
697793090d
|
refactored GMG algorithm
|
2013-07-18 15:39:42 +04:00 |
|
Vladislav Vinogradov
|
b8f0d1a0e4
|
refactored MOG2 algorithm
|
2013-07-18 15:39:42 +04:00 |
|
Vladislav Vinogradov
|
a2adab7283
|
refactored MOG algorithm
converted it to abstract interface
|
2013-07-18 15:39:42 +04:00 |
|
Vladislav Vinogradov
|
3eeaa9189c
|
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
|
2013-06-07 13:05:39 +04:00 |
|
Vladislav Vinogradov
|
49a4f27d42
|
removed VIBE implementation
|
2013-05-17 11:27:00 +04:00 |
|
Vladislav Vinogradov
|
ec52096e30
|
removed VIBE implementation
|
2013-05-16 13:47:24 +04:00 |
|
Andrey Kamaev
|
416fb50594
|
Revert "Merge pull request #836 from jet47:gpu-modules"
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
|
2013-04-18 15:03:50 +04:00 |
|
Vladislav Vinogradov
|
564f609885
|
fixed samples compilation
|
2013-04-18 13:28:34 +04:00 |
|
Andrey Kamaev
|
1ca8f33b4e
|
Merge branch '2.4'
|
2013-03-21 23:11:54 +04:00 |
|
Andrey Kamaev
|
89356ff16d
|
Move non-CV functionality from core.hpp to separate utility.hpp header
|
2013-03-20 17:56:06 +04:00 |
|
Vladislav Vinogradov
|
0a65f2f4af
|
merged gpunonfree and nonfree module
|
2013-03-18 16:14:37 +04:00 |
|
Vladislav Vinogradov
|
fd7bf0b766
|
moved SURF_GPU and VIBE to gpunonfree module
|
2013-03-18 14:06:29 +04:00 |
|
Andrey Kamaev
|
d566c6bc86
|
Revert "add new version of CommandLineParser. add empty docs"
This reverts commit 54a202b3d5.
Conflicts:
modules/core/doc/command_line_parser.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/cmdparser.cpp
modules/gpu/perf/main.cpp
modules/gpu/test/main.cpp
modules/ts/src/ts_perf.cpp
|
2012-10-15 20:01:44 +04:00 |
|
AoD314
|
54a202b3d5
|
add new version of CommandLineParser. add empty docs
|
2012-09-07 13:24:48 +04:00 |
|
Andrey Kamaev
|
f2a02feffa
|
Fix Windows build issues
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
|
2012-08-22 11:21:09 +04:00 |
|
Vladislav Vinogradov
|
beb3e6ff18
|
added GMG_GPU to bgfg_segm sample
|
2012-08-09 12:59:18 +04:00 |
|
Vladislav Vinogradov
|
e9e66e5796
|
added VIBE_GPU (background subtraction) to gpu module
|
2012-06-26 10:38:15 +00:00 |
|
Vladislav Vinogradov
|
d85ef03a42
|
added background subtraction sample for gpu module
|
2012-06-25 12:48:54 +00:00 |
|