Roman Donchenko
|
fee2ed37fc
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
|
2014-01-14 11:53:59 +04:00 |
|
Ilya Lavrenov
|
6b9ebcbf3d
|
deleted extra semicolons
|
2014-01-07 02:52:30 +04:00 |
|
Roman Donchenko
|
24dee16b12
|
Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.
Also changed the static functions to inline, to stop GCC complaining
about unused functions.
|
2013-09-05 19:03:00 +04:00 |
|
Vadim Pisarevsky
|
07e0f7bf59
|
refactored video module; use the new-style algorithms now
|
2013-03-20 19:51:49 +04:00 |
|
Andrey Kamaev
|
7b5a45eac4
|
Merged the trunk r8384:8407 (inclusive)
|
2012-05-30 08:04:37 +00:00 |
|
Vadim Pisarevsky
|
fd68cc768a
|
fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876)
|
2012-05-21 14:56:07 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Vadim Pisarevsky
|
5b6b30ba0e
|
added dedicated <modname>_init.cpp files with initModule_<modname>() functions and all the relevant structures; made BackgroundSubtractorMOG/MOG2 derivatives from Algorithm; cleaned up MOG2 implementation and made it multi-threaded.
|
2012-04-20 15:32:54 +00:00 |
|