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
7539156109
Fixed minor documentation typo
...
In section "How do we get an Affine Transformation" subsection 2 there was a ' where there should have been a ` which caused the math to be rendered incorrectly.
2013-11-27 04:09:40 -08:00
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
40212e1eb9
Link to Hough Circle Transform sample fixed in tutorial.
2013-09-09 13:53:49 +04:00
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
639bbec44a
svn repository web references are replaced with links to git
2012-08-24 15:59:43 +04:00
5100ca7508
svn repository web references are replaced with links to git
2012-08-07 14:30:36 +04:00
be63ce723f
#1672
...
updated links in cheatsheet
renamed directory for Mat tutorial
changed links from willow docs to opencv.itseez.com, from Trac to current Redmine
2012-03-11 14:35:46 +00:00
41f5a9cab9
Fixed more broken links from previous tutorials
2011-08-15 02:29:03 +00:00
43e083f145
Ok, now optimized the tutorial size for real. Made JPG/PNG optimization for all the images. Modified some tutorial files to follow these size optimizations. Now the tutorial PDF generated is 3.95MB, so enjoy!
2011-07-20 18:08:25 +00:00
a2975f337a
1) Converted all images to JPG to reduce size.
...
2) Added a raw Latex page break directive after each TOC tree. (For the PDF tutorial look).
3) Two finished tutorials:
a) one describing how the Mat data structure works and its output capabilities (format function) (demonstration YouTube video included).
b) one describing image scanning operations plus the LUT function (demonstration YouTube video included).
c) a basic filtering approach (plus multi row image scanning demonstration) in the work.
2011-07-19 22:08:54 +00:00
4168b75edc
Some tutorial extending of the Windows install and usage. Display Image retouching.
2011-07-08 19:43:29 +00:00
13bbc9ff71
Added Affine Transformation tutorial in reST
2011-06-30 13:42:46 +00:00
64c8d8f2a0
Added Remap tutorial in reST
2011-06-30 09:08:04 +00:00
762bc0f8af
Some reST syntax correction. Now the PDF documentation builds correctly under Windows using MIKTEX. Some update on the tutorial structure. Some CSS syntax correction. Windows Install Tutorial v0.4.
2011-06-30 00:41:41 +00:00
f27796e8cc
Added Hough Circle Tutorial in reST
2011-06-29 04:05:17 +00:00
d32a134b0f
Added Hough Lines Tutorial in reST
2011-06-29 00:20:05 +00:00
832262e376
Added Laplace and Canny reST tutorials and corrected a small bug in Canny sample code
2011-06-27 17:06:54 +00:00
e1aa8eead3
Added reST tutorials for copyMakeBorder, Sobel Operator, updated links in conf.py
2011-06-27 08:31:34 +00:00
ae649e8c30
Added rst Tutorial for Filter 2D
2011-06-27 04:01:01 +00:00
Roman Donchenko