mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-27 11:28:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2cc11e2c6a
opencv/doc/tutorials/introduction
History
Roman Donchenko d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
2013-12-03 17:35:21 +04:00
..
android_binary_package Android Manager Version++. 2013-11-06 14:24:18 +04:00
crosscompilation Tutorial for ARM Linux cross compilation added. 2013-02-20 12:48:30 +04:00
desktop_java Added a new tutorial "Using OpenCV Java with Eclipse". Removed information related to Eclipse from "Desktop Java" tutorial. 2013-08-27 22:42:03 +03:00
display_image Applied feature #3375 and fix of pull 1842 to avoid merging problems later 2013-11-25 10:53:03 +01:00
how_to_write_a_tutorial Normalized file endings. 2013-08-21 18:59:25 +04:00
ios_install Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
java_eclipse Added a new tutorial "Using OpenCV Java with Eclipse". Removed information related to Eclipse from "Desktop Java" tutorial. 2013-08-27 22:42:03 +03:00
linux_eclipse Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
linux_gcc_cmake After commit c7bbd1a, 'include_directories()' is needed in the CMakeLists.txt (user side). This commit updates the documentation. 2013-10-03 00:43:12 +02:00
linux_install Removed a duplicate line. 2013-08-28 13:13:15 +04:00
load_save_image Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
table_of_content_introduction Added a new tutorial "Using OpenCV Java with Eclipse". Removed information related to Eclipse from "Desktop Java" tutorial. 2013-08-27 22:42:03 +03:00
windows_install Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
windows_visual_studio_image_watch Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
windows_visual_studio_Opencv Wrong example at the visual studio tutorial. Fixed link, fixed sample 2013-11-22 10:41:17 +01:00