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 
						 
				 
			
				
					
						
							
							
								Alexander Shishkov 
							
						 
					 
					
						
						
							
						
						a8eab26bae 
					 
					
						
						
							
							fixed incorrect code in introduction tutorial  
						
						
						
						
					 
					
						2014-02-17 18:10:08 +04:00 
						 
				 
			
				
					
						
							
							
								Elliot Godzich 
							
						 
					 
					
						
						
							
						
						2806679781 
					 
					
						
						
							
							Updated DisplayImage.cpp program to compile  
						
						... 
						
						
						
						CV_WINDOW_AUTOSIZE -> WINDOW_AUTOSIZE 
						
						
					 
					
						2014-02-11 21:46:14 -08:00 
						 
				 
			
				
					
						
							
							
								Pablo Speciale 
							
						 
					 
					
						
						
							
						
						169ebae8c0 
					 
					
						
						
							
							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 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						f55740da70 
					 
					
						
						
							
							Deleted all trailing whitespace.  
						
						
						
						
					 
					
						2013-08-21 18:59:24 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						61079547f0 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-02-01 14:59:40 +04:00 
						 
				 
			
				
					
						
							
							
								Daniil Osokin 
							
						 
					 
					
						
						
							
						
						b5ed86c6a1 
					 
					
						
						
							
							Fixed sample files in "Using OpenCV with gcc and CMake" tutorial (bug  #2663 ,  #2588 )  
						
						
						
						
					 
					
						2013-01-31 13:26:29 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						0e7ca71dcc 
					 
					
						
						
							
							Normalize whitespace in documentation and text files  
						
						
						
						
					 
					
						2012-10-17 21:42:09 +04: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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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