generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
opencv/modules
History
Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
..
androidcamera
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-01-27 15:28:14 +04:00
calib3d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-03 13:45:22 +04:00
contrib
typos
2014-03-02 21:04:17 +04:00
core
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-03 13:45:22 +04:00
cuda
fix bug #3544:
2014-02-18 10:45:47 +04:00
cudaarithm
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-03 13:45:22 +04:00
cudabgsegm
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-12-03 17:35:21 +04:00
cudacodec
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-12-03 17:35:21 +04:00
cudafeatures2d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-12-03 17:35:21 +04:00
cudafilters
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-12-03 17:35:21 +04:00
cudaimgproc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-02-25 15:02:24 +04:00
cudalegacy
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-02-03 13:23:59 +04:00
cudaoptflow
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-02-17 15:24:05 +04:00
cudastereo
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-12-03 17:35:21 +04:00
cudawarping
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-12-03 17:35:21 +04:00
cudev
Removed another usage of __func__, following #1763.
2013-11-11 17:02:50 +04:00
features2d
fixed defects from coverity.com
2014-02-23 20:21:08 +04:00
flann
Merge pull request #2354 from gleb-sternharz:Branch_2.4.8
2014-02-17 15:00:47 +04:00
highgui
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-03 13:45:22 +04:00
imgproc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-03 13:45:22 +04:00
java
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-03 13:45:22 +04:00
legacy
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-03 13:45:22 +04:00
matlab
Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab.
2014-02-13 23:53:58 +08:00
ml
fixed defects from coverity.com
2014-02-23 20:21:08 +04:00
nonfree
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-03 13:45:22 +04:00
objdetect
fixed defects from Xcode
2014-02-25 17:33:12 +04:00
optim
Merge pull request #1521 from nailbiter:optimCG
2013-10-29 16:14:32 +04:00
photo
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-03 13:45:22 +04:00
python
core/umat: usage flags (with proposals from PR #2195)
2014-02-14 15:40:16 +04:00
shape
fixed defects from Xcode
2014-02-25 17:33:12 +04:00
softcascade
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
stitching
TAPI: fix perf test for warpers
2014-02-20 13:09:06 +04:00
superres
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-02-25 15:02:24 +04:00
ts
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-03-03 13:45:22 +04:00
video
fixed defects from Xcode
2014-02-25 17:33:12 +04:00
videostab
Code review fixes.
2013-12-23 11:34:46 +04:00
viz
modified viz module header layout for 2.4 compatibility
2014-02-02 16:23:34 +04:00
world
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-11-11 16:55:36 +04:00
CMakeLists.txt
…
refman.rst.in
…