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 |
|