Roman Donchenko
|
4cf9990d4e
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
|
2013-07-03 19:53:21 +04:00 |
|
Kirill Kornyakov
|
f065c46fbe
|
Completely get rid of opencv_group
|
2013-06-28 12:15:14 +04:00 |
|
Andrey Kamaev
|
0734d9b877
|
Merge branch '2.4'
|
2013-01-29 14:16:07 +04:00 |
|
Daniil Osokin
|
f9bff103dd
|
Removed obsolete steps from Windows installation tutorial (bug #2550)
|
2013-01-28 17:46:03 +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 |
|
Kirill Kornyakov
|
aedf56404e
|
made imread description slightly better #2406
|
2012-10-15 15:23:38 +04:00 |
|
Vsevolod Glumov
|
a2088d0c52
|
Replaced SVN instructions with Git ones for 'Installation in Windows' section (Issue #2249); Also, fixed both bugs from issue #2374 in the same section.
|
2012-10-11 18:37:00 +04:00 |
|
Alexander Smorkalov
|
9a76573172
|
Auto expand of OpenCV version for Android Library prject and some documentation pages added.
|
2012-10-09 18:30:58 +04:00 |
|
Andrey Kamaev
|
a4ec89fb2c
|
Merged version references fix
|
2012-07-02 15:41:14 +00:00 |
|
Kirill Kornyakov
|
ec0ec69307
|
slightly updated windows_install.rst tutorial
|
2012-06-08 06:26:16 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +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 |
|
Bernat Gabor
|
0451779d2c
|
Ticket #1240 resolved.
|
2011-08-19 10:12:33 +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 |
|
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
|
4168b75edc
|
Some tutorial extending of the Windows install and usage. Display Image retouching.
|
2011-07-08 19:43:29 +00:00 |
|
Bernat Gabor
|
e18de3c6ab
|
Added the OpenCV with Visual Studio tutorial. Enhanced, extended the Windows Installation one. Some minor CSS changes to avoid unnecessary large spaces inside enumerations in the tutorials.
|
2011-07-06 00:01:27 +00:00 |
|
Andrey Kamaev
|
f301cda780
|
Fixed 'Undefined control sequence' error in recently added tutorial
|
2011-07-04 12:19:40 +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
|
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 |
|
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 |
|