mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6c253a41c2
opencv/doc
History
Roman Donchenko bae85660da Merge remote-tracking branch 'origin/2.4' 
Pull requests:
	#943 from jet47:cuda-5.5-support
	#944 from jet47:cmake-2.8.11-cuda-fix
	#912 from SpecLad:contributing
	#934 from SpecLad:parallel-for
	#931 from jet47:gpu-test-fixes
	#932 from bitwangyaoyao:2.4_fixBFM
	#918 from bitwangyaoyao:2.4_samples
	#924 from pengx17:2.4_arithm_fix
	#925 from pengx17:2.4_canny_tmp_fix
	#927 from bitwangyaoyao:2.4_perf
	#930 from pengx17:2.4_haar_ext
	#928 from apavlenko:bugfix_3027
	#920 from asmorkalov:android_move
	#910 from pengx17:2.4_oclgfft
	#913 from janm399:2.4
	#916 from bitwangyaoyao:2.4_fixPyrLK
	#919 from abidrahmank:2.4
	#923 from pengx17:2.4_macfix

Conflicts:
	modules/calib3d/src/stereobm.cpp
	modules/features2d/src/detectors.cpp
	modules/gpu/src/error.cpp
	modules/gpu/src/precomp.hpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/morph.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/pyrlk.cpp
	modules/video/src/bgfg_gaussmix2.cpp
	modules/video/src/lkpyramid.cpp
	platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
	platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
	platforms/scripts/ABI_compat_generator.py
	samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
..
_static removed obsolete docs 2011-05-09 16:20:46 +00:00
_themes/blue Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
pattern_tools Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
tutorials fix parenthesis 2013-05-22 13:57:43 +03:00
user_guide Merge branch '2.4' 2013-01-25 16:30:36 +04:00
vidsurv "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
acircles_pattern.png propagated some more changes from 2.3 to trunk 2011-06-23 12:15:35 +00:00
check_docs2.py Merge branch '2.4' 2013-04-12 15:35:38 +04:00
check_docs_whitelist.txt updated whitelist 2011-07-08 14:34:03 +00:00
check_docs.py Merge branch '2.4' 2013-04-12 15:35:38 +04:00
CMakeLists.txt android -> plarforms/android 2013-05-27 11:10:38 +04:00
conf.py android -> plarforms/android 2013-05-27 11:10:38 +04:00
Doxyfile.in Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
haartraining.htm "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
license.txt minor in license file 2012-08-07 13:22:41 +04:00
mymath.sty moved the new docs from docroot to doc 2011-05-09 16:34:47 +00:00
ocv.py Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
opencv_cheatsheet.tex Fixed cheatsheet for loop (bug #2701) 2013-01-28 18:41:59 +04:00
opencv-logo2.png "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
opencv-logo-white.png merged revisions r7802,r7804,r7805 from 2.4 branch 2012-04-03 00:33:33 +00:00
opencv-logo.png "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
opencv.bib added documentation on LatentSVM algorithm 2011-04-03 10:16:28 +00:00
opencv.ico remove interfaces from installation; remove opencv/utils dir completely 2010-12-03 22:55:08 +00:00
opencv.jpg "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
packaging.txt Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
patch_refman_latex.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
pattern.png replaced 8x6 pattern with 9x6, which orientation can be determined without any ambiguity 2010-12-13 15:00:35 +00:00
reformat.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00