mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
c4fb0e9dbb
opencv/doc/tutorials
History
Roman Donchenko 13cd0a0502 Merge remote-tracking branch 'origin/2.4' 
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
..
calib3d Fix bug with indices 2013-06-14 13:12:35 +04:00
contrib updated sources to correct buildbot warnings 2013-04-30 17:32:47 +02:00
core Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
definitions minor chnges for conflict removal 2013-04-29 15:12:44 +02:00
features2d Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
general/table_of_content_general 1) Converted all images to JPG to reduce size. 2011-07-19 22:08:54 +00:00
gpu Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
highgui Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
images adding retina tutorial 2012-10-30 15:06:13 +04:00
imgproc fix parenthesis 2013-05-22 13:57:43 +03:00
introduction Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
ios Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
ml fixed many errors in warnings in rst docs; added ocl module description (by Niko Li) 2012-10-31 15:15:51 +04:00
objdetect Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
video/table_of_content_video Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
tutorials.rst updated tutorial, rapid spell check, retina parameters discussion added 2012-10-30 15:06:13 +04:00