StevenPuttemans 
							
						 
					 
					
						
						
							
						
						564a8ed208 
					 
					
						
						
							
							adapted all nonfree header inclusion since it doesn't exist anymore as a module  
						
						
						
						
					 
					
						2014-08-25 21:31:34 +02:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						ee90b88dd7 
					 
					
						
						
							
							Merge pull request  #2720  from pglotov:master  
						
						
						
						
					 
					
						2014-07-25 12:54:22 +00:00 
						 
				 
			
				
					
						
							
							
								Petr Glotov 
							
						 
					 
					
						
						
							
						
						7a77cf584a 
					 
					
						
						
							
							added timelapse  
						
						
						
						
					 
					
						2014-07-15 09:32:47 -07:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						b1793e2fb9 
					 
					
						
						
							
							Merge pull request  #2939  from adishavit:sample-fix_stitching_pipeline  
						
						
						
						
					 
					
						2014-07-15 08:09:04 +00:00 
						 
				 
			
				
					
						
							
							
								vbystricky 
							
						 
					 
					
						
						
							
						
						4286f60387 
					 
					
						
						
							
							Extract imgcodecs module from highgui  
						
						
						
						
					 
					
						2014-07-07 16:28:08 +04:00 
						 
				 
			
				
					
						
							
							
								Adi Shavit 
							
						 
					 
					
						
						
							
						
						7674f3ddbf 
					 
					
						
						
							
							Added call to clone() to avoid unexpected change to external data.  
						
						... 
						
						
						
						- Fix both stitching_detailed.cpp sample and cv::Stitcher. 
						
						
					 
					
						2014-07-03 22:14:58 +03:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						c1ea6f3c42 
					 
					
						
						
							
							TAPI: stitching: improve warpers  
						
						
						
						
					 
					
						2014-04-11 13:01:07 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						1d9808e5d5 
					 
					
						
						
							
							TAPI: stitching, replaced Mat->UMat/_Array  
						
						
						
						
					 
					
						2014-04-11 13:01:06 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						118709fd9f 
					 
					
						
						
							
							added OpenCL accelerated warpers  
						
						
						
						
					 
					
						2014-01-10 18:16:56 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						0c7663eb3b 
					 
					
						
						
							
							Merge branch 'master' into gpu-cuda-rename  
						
						... 
						
						
						
						Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp 
						
						
					 
					
						2013-09-06 15:44:44 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						ae94256edc 
					 
					
						
						
							
							renmaed gpu module -> cuda  
						
						
						
						
					 
					
						2013-09-02 14:00:44 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						d4901a99ea 
					 
					
						
						
							
							renamed gpuwarping -> cudawarping  
						
						
						
						
					 
					
						2013-09-02 14:00:42 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						e895b7455e 
					 
					
						
						
							
							renamed gpu namespace -> cuda  
						
						
						
						
					 
					
						2013-09-02 14:00:41 +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 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						37ea872204 
					 
					
						
						
							
							added handling of camera parameters estimation errors ( #3122 )  
						
						
						
						
					 
					
						2013-07-03 15:20:14 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						3eeaa9189c 
					 
					
						
						
							
							Revert "Revert "Merge pull request  #836  from jet47:gpu-modules""  
						
						
						
						
					 
					
						2013-06-07 13:05:39 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						416fb50594 
					 
					
						
						
							
							Revert "Merge pull request  #836  from jet47:gpu-modules"  
						
						... 
						
						
						
						This reverts commit fba72cb60d02131ffb62 
						
						
					 
					
						2013-04-18 15:03:50 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						fdeec6896c 
					 
					
						
						
							
							stitching module fixes  
						
						
						
						
					 
					
						2013-04-18 13:28:30 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						29cfeb7cee 
					 
					
						
						
							
							Fix build of apps and samples  
						
						
						
						
					 
					
						2013-03-22 22:14:36 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						1ca8f33b4e 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-03-21 23:11:54 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						89356ff16d 
					 
					
						
						
							
							Move non-CV functionality from core.hpp to separate utility.hpp header  
						
						
						
						
					 
					
						2013-03-20 17:56:06 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						0a65f2f4af 
					 
					
						
						
							
							merged gpunonfree and nonfree module  
						
						
						
						
					 
					
						2013-03-18 16:14:37 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						fd7bf0b766 
					 
					
						
						
							
							moved SURF_GPU and VIBE to gpunonfree module  
						
						
						
						
					 
					
						2013-03-18 14:06:29 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						8fb6d9f650 
					 
					
						
						
							
							Fix Android build warnings  
						
						
						
						
					 
					
						2012-10-19 16:14:14 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						044d38a051 
					 
					
						
						
							
							expanded cv::threshold parallelization to other threading frameworks; fixed potential bug with unprocessed bottom of the image; fixed build problem in stitching  
						
						
						
						
					 
					
						2012-10-09 22:38:04 +04:00 
						 
				 
			
				
					
						
							
							
								alexey.spizhevoy 
							
						 
					 
					
						
						
							
						
						a39bce204d 
					 
					
						
						
							
							implemented DP-based seam estimation method  
						
						
						
						
					 
					
						2012-08-07 16:24:21 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						c5aba337e9 
					 
					
						
						
							
							Fixed number of warnings. Fixed mingw64 build.  
						
						
						
						
					 
					
						2012-06-12 14:46:12 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						f62028dc16 
					 
					
						
						
							
							Fixed mingw build.  
						
						
						
						
					 
					
						2012-06-08 03:15:08 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						49a1ba6038 
					 
					
						
						
							
							Set stricter warning rules for gcc  
						
						
						
						
					 
					
						2012-06-07 17:21:29 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						e87a07e2aa 
					 
					
						
						
							
							Fixed bug  #1693 . Also corrected default parameters for stitching.  
						
						
						
						
					 
					
						2012-03-19 11:51:18 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						4985c1b632 
					 
					
						
						
							
							fixed hundreds of warnings from MSVC 2010.  
						
						
						
						
					 
					
						2012-03-16 21:21:04 +00:00 
						 
				 
			
				
					
						
							
							
								Ivan Korolev 
							
						 
					 
					
						
						
							
						
						6e2507c197 
					 
					
						
						
							
							Added some new warpers.  
						
						
						
						
					 
					
						2012-03-14 12:59:23 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						984eb99428 
					 
					
						
						
							
							Global CMake reorganization:  
						
						... 
						
						
						
						[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules 
						
						
					 
					
						2012-02-03 11:26:49 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						28e006ad4f 
					 
					
						
						
							
							Fixed median focal length estimation in the stitching module  
						
						
						
						
					 
					
						2011-10-24 12:35:11 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						f299bde3a9 
					 
					
						
						
							
							Added ORB features finder into stitching module  
						
						
						
						
					 
					
						2011-10-19 10:48:45 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						404e9cb9d5 
					 
					
						
						
							
							Refactored warpers in the stitching module, added buildMaps function into the RotationWarper interface  
						
						
						
						
					 
					
						2011-10-03 06:31:24 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						230cc3e0c3 
					 
					
						
						
							
							Minor fix in stitching_detailed  
						
						
						
						
					 
					
						2011-09-26 10:04:50 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						66b41b67f9 
					 
					
						
						
							
							Added support of GPU in stitching seam estimators  
						
						
						
						
					 
					
						2011-09-26 07:57:05 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						16f5c67914 
					 
					
						
						
							
							Added support of vertical straightening into stitching  
						
						
						
						
					 
					
						2011-09-24 08:20:13 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						39533a0b1b 
					 
					
						
						
							
							Added BA refinement flags into stitching_detailed  
						
						
						
						
					 
					
						2011-09-22 08:58:48 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						4ee462c961 
					 
					
						
						
							
							Added selction of BA cost function in stitching samples (and added other BA cost func into stitching module)  
						
						
						
						
					 
					
						2011-09-21 13:22:12 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						dbce155874 
					 
					
						
						
							
							Refactored motion estimators in stitching module  
						
						
						
						
					 
					
						2011-09-21 12:13:07 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						4a5abc7552 
					 
					
						
						
							
							Added translation parameter into stitching module warpers. For now only PlaneWarper and PlaneWarperGpu warpers support it.  
						
						
						
						
					 
					
						2011-09-21 10:53:23 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						f262f58297 
					 
					
						
						
							
							Changed one CLI message in stitching_detailed.  
						
						
						
						
					 
					
						2011-09-19 06:37:22 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						07efb17d12 
					 
					
						
						
							
							Fixed warper selection bug in stitching_detailed. Removed estimation of aspect ratio in BA in stitching to avoid stretching of input images. Did minor refactoring.  
						
						
						
						
					 
					
						2011-09-19 06:22:40 +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 
						 
				 
			
				
					
						
							
							
								P. Karasev 
							
						 
					 
					
						
						
							
						
						6030e029e3 
					 
					
						
						
							
							touch stitching app, test/verify svn access  
						
						
						
						
					 
					
						2011-09-07 15:00:27 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						cbb6ac0c34 
					 
					
						
						
							
							refactored features finders in stitching module  
						
						
						
						
					 
					
						2011-09-07 12:48:48 +00:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						505e8e0936 
					 
					
						
						
							
							minor refactoring of stitching  
						
						
						
						
					 
					
						2011-09-07 11:22:00 +00:00