Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Zac Stewart
8049296cda
Correct name of eye function
2013-08-30 06:34:47 -04:00
Zac Stewart
f36a9f745f
Remove extraneous colon before ':basicstructures:'
2013-08-30 06:34:23 -04:00
Roman Donchenko
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
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
Andrey Kamaev
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
Andrey Kamaev
dddd285d3b
Merge branch 2.4
2013-02-24 20:16:53 +04:00
NCBee
7249457771
Update doc/tutorials/core/adding_images/adding_images.rst
...
Quick fix for: http://code.opencv.org/issues/2803
2013-02-23 10:28:24 -05:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Andy Maloney
e7ea90f87f
Mat tutorial - grammar and spelling fixes
2013-02-01 23:39:40 -05:00
Vadim Pisarevsky
70c409f0e8
fixed building PDFs in master
2012-11-26 20:40:45 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Vadim Pisarevsky
a4adf57edc
fixed typos in the mat tutorial (ticket #2380 )
2012-10-01 16:35:12 +04:00
Andrey Kamaev
5100ca7508
svn repository web references are replaced with links to git
2012-08-07 14:30:36 +04:00
Alexander Shishkov
5c23d52618
fixed documentation compilation errors after r7568
2012-03-21 09:48:34 +00:00
Alexander Shishkov
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
Alexander Shishkov
042a834d9d
#fixed 1644
2012-03-02 18:24:46 +00:00
Alexander Shishkov
defbdcba77
fixed #1645
2012-03-02 18:06:15 +00:00
Vadim Pisarevsky
fef90e2270
fixed a few bugs in mat-mask-operations tutorial (thanks to Shiqi Yu)
2012-01-31 15:58:47 +00:00
Ana Huaman
a0d73eadd3
Updated broken links of tutorials in core and fixed weird-looking bullets (error of mine)
2011-08-15 01:25:36 +00:00
Bernat Gabor
a5f38806ab
Small modifications to the scan tutorial and added the video-input-psnr-ssim sample file.
2011-08-09 05:43:58 +00:00
Bernat Gabor
ed801d3e65
Added the "Interoperability with OpenCV 1" tutorial.
2011-08-08 05:58:10 +00:00
Bernat Gabor
6b5ea5931d
Added the "Mask operations on matrices" tutorial (with its sample). Plus modified some other core tutorials.
2011-07-27 17:52:27 +00:00
Bernat Gabor
26bd6b3f5f
Added the File Input and Output using XML and YAML files tutorial.
2011-07-27 11:35:11 +00:00
Bernat Gabor
2d3606a58f
Finished the DFT tutorial for the core section.
2011-07-25 10:06:03 +00:00
Bernat Gabor
f25603112a
Added Fernandos first tutorial regarding SVMs. Extended the global links (conf.py). Corrected the author names. Minor modification to the dft tutorial.
2011-07-25 07:15:52 +00:00
Bernat Gabor
ffe7a658fb
Sample files for image scanning, basic Mat, file I/O. Added Victors removed tutorials back in the system. Some typo fixing.Expanded conf.py with new global links.
2011-07-22 15:11:59 +00:00
Vadim Pisarevsky
bddcc6ffcc
fixed xcolor warnings when building opencv_tutorials.pdf
2011-07-20 22:21:32 +00:00
Bernat Gabor
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
Bernat Gabor
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
Bernat Gabor
6be9fbfa6d
Reformatted the TOC tables in tutorials to look just as good in PDFs as in HTML. Updated the default.css_t too for this. Added the "Windows Install" tutorial (with videos).
2011-07-04 11:04:56 +00:00
Bernat Gabor
42bd52f046
Corrected the place of accent in the name of Ana Huamán.
2011-06-23 22:28:27 +00:00
Bernat Gabor
9426249a88
New structure (following the documentation) for the tutorials. Normalized image sizes for TOC display.
2011-06-23 21:55:24 +00:00
