| 
							
							
								 vbystricky | 4286f60387 | Extract imgcodecs module from highgui | 2014-07-07 16:28:08 +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 | e9a28f66ee | Normalized file endings. | 2013-08-21 18:59:25 +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 |  | 
			
				
					| 
							
							
								 Marina Kolpakova | 680a44189c | merged the trunk r8704:8716 | 2012-06-28 16:13:29 +00:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | d48d7b2b46 | Updated warning options for GCC; fixed new warnings. | 2012-06-20 12:27:02 +00:00 |  | 
			
				
					| 
							
							
								 Alexey Spizhevoy | 23636433d7 | Updated bundle adjustment in stitching module: 1) it minimizes reprojection error now, 2) it minimizes error over focal, aspect, p.p.x, p.p.y parameters. Refactored and updated warpers. | 2011-09-16 12:25:23 +00:00 |  | 
			
				
					| 
							
							
								 Alexey Spizhevoy | 505e8e0936 | minor refactoring of stitching | 2011-09-07 11:22:00 +00:00 |  | 
			
				
					| 
							
							
								 Alexey Spizhevoy | c9a41c6802 | added first version of public stitching API, added simple sample which uses that API, old sample renamed to stitching_detailed | 2011-09-07 11:14:27 +00:00 |  | 
			
				
					| 
							
							
								 Alexey Spizhevoy | 95a3ffd0c5 | put all old stitching API into detail namespace | 2011-09-07 06:34:22 +00:00 |  | 
			
				
					| 
							
							
								 Alexey Spizhevoy | 9be4701f24 | turned opencv_stitching application to module and sample | 2011-09-05 10:41:54 +00:00 |  |