Ilya Lavrenov
|
72c35d3a89
|
fixed mog2
|
2013-10-04 18:19:01 +04:00 |
|
Roman Donchenko
|
81eb4bd8be
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
|
2013-10-01 15:57:33 +04:00 |
|
Ilya Lavrenov
|
9311f84109
|
disabled MOG tests if no video input support
|
2013-09-13 12:47:25 +04:00 |
|
Roman Donchenko
|
95c2e8b51f
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
|
2013-09-10 11:30:19 +04:00 |
|
Jin Ma
|
2fb0d23104
|
Removed unnecessary process for conversion to 4-channel format.
|
2013-09-07 10:40:30 +08:00 |
|
Jin Ma
|
172242a94e
|
Revised performance test according to the feedback of the community.
|
2013-09-06 13:39:41 +08:00 |
|
Jin Ma
|
1366df8250
|
MOG&MOG2: Modified the performance test according to the feedback of the community.
|
2013-09-05 19:33:27 +08:00 |
|
Jin Ma
|
dd73016c8b
|
Removed whitespace.
|
2013-09-04 15:00:36 +08:00 |
|
Jin Ma
|
e528f39def
|
Added the performance test for mog and mog2.
|
2013-09-04 14:37:46 +08:00 |
|