Commit Graph

12 Commits

Author SHA1 Message Date
Roman Donchenko 48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
yash 017a282c7a Minor error in the documentation Load and Save Image 2014-02-18 10:34:58 +05:30
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 7572b4d400 Merge branch '2.4' 2013-01-30 15:12:50 +04:00
Daniil Osokin 568591670c Fixed color code in cvtColor in "Load, Modify, and Save an Image" tutorial (bug #2739) 2013-01-30 08:16:47 +04:00
Andrey Kamaev 0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04: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 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
Gary Bradski 04830e5dc0 Edit load and save to load, modify and save 2011-06-29 21:34:52 +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