third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3d7a457c97
opencv/modules
History
Roman Donchenko 3d7a457c97 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/introduction/linux_install/linux_install.rst
	modules/core/doc/operations_on_arrays.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/gpu/src/cuda/resize.cu
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
..
androidcamera Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-24 19:02:16 +04:00
calib3d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
contrib Merge pull request #2578 from akrynski:patch-1 2014-04-15 13:21:08 +04:00
core Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
cuda Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-07 14:59:34 +04:00
cudaarithm fix bug #3678 (cuda::integral failures) 2014-05-14 12:48:12 +04:00
cudabgsegm Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-07 14:59:34 +04:00
cudacodec
cudafeatures2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-11 17:20:01 +04:00
cudafilters
cudaimgproc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-11 17:20:01 +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
cudawarping Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
cudev fix bug #3678 (cuda::integral failures) 2014-05-14 12:48:12 +04:00
features2d Merge pull request #2673 from BloodAxe:kaze 2014-05-19 17:35:22 +04:00
flann Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
highgui Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
imgproc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
java Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-07 14:59:34 +04:00
legacy cv2cvtest part2 2014-04-09 13:08:51 +04:00
matlab Matlab bindings: CMakeLists.txt: use "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}" as MEX_LIB_DIR only when compiling with MSVC, otherwise, use only "${LIBRARY_OUTPUT_PATH}" 2014-05-03 17:37:48 +02:00
ml Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
nonfree Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
objdetect Merge pull request #2699 from GregoryMorse:patch-1 2014-05-13 11:58:25 +04:00
optim cv2cvtest part2 2014-04-09 13:08:51 +04:00
photo cv2cvtest part2 2014-04-09 13:08:51 +04:00
python exposed OpenCL-control functions to python 2014-05-14 17:42:21 +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 replaced sanity check condition for stitching perf test 2014-04-30 18:02:06 +04:00
superres Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-24 19:02:16 +04:00
ts Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-21 16:47:35 +04:00
video Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
videostab Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-17 14:14:07 +04:00
viz Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-14 16:08:02 +04:00
world Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-12 17:38:07 +04:00
CMakeLists.txt
refman.rst.in