Commit Graph

9 Commits

Author SHA1 Message Date
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
ilya-lavrenov
27947474ec fixed data path 2013-09-06 13:25:56 +04:00
ilya-lavrenov
0f8f489658 changed data path and eps 2013-09-04 18:46:46 +04:00
Jin Ma
1e8194fd3c Optimized mog and mog2, which have much better performance. 2013-08-22 15:42:07 +08:00
Jin Ma
a3aa7966ae Resolved compiling errors under Linux. 2013-08-16 16:07:53 +08:00
Jin Ma
3fb0bf6e99 Added MOG and MOG2. 2013-08-16 14:19:46 +08:00