Pavel Rojtberg 
							
						 
					 
					
						
						
							
						
						9d89c369f8 
					 
					
						
						
							
							update SOLVEPNP documentation  
						
						
						
						
					 
					
						2015-12-10 23:02:17 +01:00 
						 
				 
			
				
					
						
							
							
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						d01bedbc61 
					 
					
						
						
							
							Removed Sphinx documentation files  
						
						
						
						
					 
					
						2014-12-26 19:12:19 +03:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						f317d1277f 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2014-10-06 23:46:30 +02:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						72fb85f6a0 
					 
					
						
						
							
							Removing whitespaces  
						
						
						
						
					 
					
						2014-10-06 13:01:23 +02:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						4d54f35a96 
					 
					
						
						
							
							Updating documentation  
						
						
						
						
					 
					
						2014-10-06 10:31:50 +02:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						dc76ca5fc9 
					 
					
						
						
							
							Updating documentation  
						
						
						
						
					 
					
						2014-10-02 21:39:29 +02:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						ea893bf9d9 
					 
					
						
						
							
							Updating UPNP documentation  
						
						
						
						
					 
					
						2014-10-02 17:05:06 +02:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						e5ab0ac294 
					 
					
						
						
							
							Merge pull request  #3201  from PhilLab:patch-3  
						
						
						
						
					 
					
						2014-09-14 18:49:35 +00:00 
						 
				 
			
				
					
						
							
							
								Philipp Hasper 
							
						 
					 
					
						
						
							
						
						62c704d1e9 
					 
					
						
						
							
							Updated PnP parameter documentation  
						
						
						
						
					 
					
						2014-09-09 12:24:05 +02:00 
						 
				 
			
				
					
						
							
							
								Philipp Hasper 
							
						 
					 
					
						
						
							
						
						cc7aa5890d 
					 
					
						
						
							
							Fixing documentation links  
						
						
						
						
					 
					
						2014-09-08 14:41:29 +02:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						887a950243 
					 
					
						
						
							
							Merge pull request  #3116  from shubhra:master  
						
						
						
						
					 
					
						2014-08-22 07:15:40 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						5afaa6b1e7 
					 
					
						
						
							
							Merge pull request  #3129  from PhilLab:patch-2  
						
						
						
						
					 
					
						2014-08-21 05:30:17 +00:00 
						 
				 
			
				
					
						
							
							
								Shubhra Pandit 
							
						 
					 
					
						
						
							
						
						7b2a1d15cc 
					 
					
						
						
							
							Doc changes for feature changes 1544 and 1557  
						
						
						
						
					 
					
						2014-08-20 20:49:50 -04:00 
						 
				 
			
				
					
						
							
							
								PhilLab 
							
						 
					 
					
						
						
							
						
						e09adc4fde 
					 
					
						
						
							
							Clarified parameter useExtrinsicGuess in solvePnP  
						
						
						
						
					 
					
						2014-08-19 11:08:16 +02:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						1dec1645e5 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/Itseez/opencv  
						
						
						
						
					 
					
						2014-08-12 16:45:22 +02:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						afdb67b462 
					 
					
						
						
							
							SOLVEPNP_* flags  
						
						
						
						
					 
					
						2014-08-11 16:28:09 +02:00 
						 
				 
			
				
					
						
							
							
								mshabunin 
							
						 
					 
					
						
						
							
						
						c54b8f9b00 
					 
					
						
						
							
							Merge remote-tracking branch 'master' into stitch-fix  
						
						... 
						
						
						
						* 'master' of github.com:itseez/opencv: (82 commits)
  moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
  added some basic functionality needed by the new face module (moved from the old "contrib")
  moved to the new opencv_contrib/face module
  fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
  Fixed review comment from Vadim Pisarevsky
  modified farneback sample to use T-API
  ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
  small fix for GaussianBlur ocl test
  fix binary package build
  small fix for ocl_resize
  fix IOS framework
  fixed test ocl_MatchTemplate for sparse matrix
  Fixed typos
  fixing error, wrong template method param.
  fixing Mac build
  some formal changes (generally adding constness)
  Fixed choice of kercn and rowsPerWI for non-Intel device.
  fixed nDiffs for CalcBackProject
  fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
  Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
  ...
Conflicts:
	modules/core/include/opencv2/core/mat.inl.hpp 
						
						
					 
					
						2014-08-11 14:50:08 +04:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						c7f6c0cb9f 
					 
					
						
						
							
							Fixed warnings + RANSAC confidence to double  
						
						
						
						
					 
					
						2014-08-11 10:17:42 +02:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						a3e74ec521 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						... 
						
						
						
						Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst 
						
						
					 
					
						2014-08-05 12:59:47 +02:00 
						 
				 
			
				
					
						
							
							
								Samson Yilma 
							
						 
					 
					
						
						
							
						
						4fe04775d1 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into HomographyDecomp  
						
						
						
						
					 
					
						2014-07-30 20:36:41 -04:00 
						 
				 
			
				
					
						
							
							
								Samson Yilma 
							
						 
					 
					
						
						
							
						
						3c5eb7de84 
					 
					
						
						
							
							updated documentation for decomposeHomography  
						
						
						
						
					 
					
						2014-07-30 18:53:33 -04:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						5f54a22d29 
					 
					
						
						
							
							Update documentation for DLS  
						
						
						
						
					 
					
						2014-07-25 11:39:06 +02:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						89246e1a45 
					 
					
						
						
							
							Update Ransac documentation  
						
						
						
						
					 
					
						2014-07-09 10:59:00 +02:00 
						 
				 
			
				
					
						
							
							
								edgarriba 
							
						 
					 
					
						
						
							
						
						ce07024a44 
					 
					
						
						
							
							Updated solvePnPRansac()  
						
						
						
						
					 
					
						2014-07-08 17:09:55 +02:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						a3bde36c84 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/contrib/doc/facerec/facerec_api.rst
	modules/contrib/include/opencv2/contrib/contrib.hpp
	modules/contrib/src/facerec.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/highgui/src/loadsave.cpp
	modules/imgproc/src/pyramids.cpp
	modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
	modules/python/src2/gen.py
	modules/python/test/test.py
	modules/superres/test/test_superres.cpp
	samples/cpp/facerec_demo.cpp 
						
						
					 
					
						2014-07-08 14:33:56 +04:00 
						 
				 
			
				
					
						
							
							
								Daniel Angelov 
							
						 
					 
					
						
						
							
						
						660d7cd3ae 
					 
					
						
						
							
							Updated findHomography docs branch 2.4  
						
						... 
						
						
						
						Updated the documents to give warning to the users of `findHomography` that the function may return an empty matrix in some cases. 
The user must take care of checking that. 
						
						
					 
					
						2014-06-16 13:05:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Angelov 
							
						 
					 
					
						
						
							
						
						54292a8376 
					 
					
						
						
							
							Removed "CV_" prefix from constants in docs  
						
						... 
						
						
						
						The `calib3d.hpp` has a definition of the constant that does not contain the prefix "CV_".
The affected methods were `findHomography` and `findEssentialMat`.
Now the documentation updates the definition of the constants to conform to the header. 
						
						
					 
					
						2014-06-14 18:41:04 +01:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						2b2ce3f6e9 
					 
					
						
						
							
							Merge pull request  #2726  from Ilya-Krylov:2.4  
						
						
						
						
					 
					
						2014-06-12 21:37:47 +04:00 
						 
				 
			
				
					
						
							
							
								Daniel Angelov 
							
						 
					 
					
						
						
							
						
						ce1b6e2137 
					 
					
						
						
							
							Fixed inconsistency with flag names  
						
						... 
						
						
						
						Fixed inconsistency with flag names for solvePnP. 
The default value for the function lacks the CV_ prefix. The code checks against "ITERATIVE". The suggested values for the parameters *include* the prefix.
Even though the enum CV_ITERATIVE (+ CV_P3P, CV_EPNP) = ITERATIVE (& P3P, EPNP), lets show to the users only one of them.
Now the user sees only {ITERATIVE, P3P, EPNP}. 
						
						
					 
					
						2014-05-30 23:59:32 +01:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						3d7a457c97 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	doc/tutorials/introduction/linux_install/linux_install.rst
	modules/core/doc/operations_on_arrays.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/gpu/src/cuda/resize.cu
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/video/src/bgfg_gaussmix2.cpp 
						
						
					 
					
						2014-05-19 18:39:20 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Krylov 
							
						 
					 
					
						
						
							
						
						0d2fab86b4 
					 
					
						
						
							
							Changed documentation for namespace fisheye  
						
						
						
						
					 
					
						2014-05-19 18:16:00 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Krylov 
							
						 
					 
					
						
						
							
						
						c30fef1f9d 
					 
					
						
						
							
							Fixed build issues  
						
						
						
						
					 
					
						2014-05-14 18:58:39 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						c607dadc49 
					 
					
						
						
							
							Merge pull request  #2729  from StevenPuttemans:bug_3252  
						
						
						
						
					 
					
						2014-05-13 14:17:09 +04:00 
						 
				 
			
				
					
						
							
							
								StevenPuttemans 
							
						 
					 
					
						
						
							
						
						b382984810 
					 
					
						
						
							
							fix bug 3252  
						
						
						
						
					 
					
						2014-05-12 15:01:15 +02:00 
						 
				 
			
				
					
						
							
							
								StevenPuttemans 
							
						 
					 
					
						
						
							
						
						2b4241c10b 
					 
					
						
						
							
							fixed bug 3484  
						
						
						
						
					 
					
						2014-05-12 14:40:12 +02:00 
						 
				 
			
				
					
						
							
							
								Ilya Krylov 
							
						 
					 
					
						
						
							
						
						e4a9c0f184 
					 
					
						
						
							
							Fixed review comments  
						
						
						
						
					 
					
						2014-05-12 15:37:47 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Krylov 
							
						 
					 
					
						
						
							
						
						349ff631a5 
					 
					
						
						
							
							Added sample of work of Fisheye::undistortImage and its description to documentation. Removed readPoints and readExtrinsic (useless)  
						
						
						
						
					 
					
						2014-05-07 20:53:07 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Krylov 
							
						 
					 
					
						
						
							
						
						ef01044b2f 
					 
					
						
						
							
							Added documentation for Fisheye::stereoCalibrate  
						
						
						
						
					 
					
						2014-05-06 11:09:22 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Krylov 
							
						 
					 
					
						
						
							
						
						e6aa8ce932 
					 
					
						
						
							
							Corrected notes  
						
						
						
						
					 
					
						2014-04-29 10:24:39 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Krylov 
							
						 
					 
					
						
						
							
						
						f0f741b796 
					 
					
						
						
							
							Added documentation  
						
						
						
						
					 
					
						2014-04-28 15:27:30 +04:00 
						 
				 
			
				
					
						
							
							
								Samson Yilma 
							
						 
					 
					
						
						
							
						
						e6420bde73 
					 
					
						
						
							
							Added function decomposeHomographyMat. New files added are homography_decomp.cpp and test_homography_decomp.cpp.  
						
						... 
						
						
						
						Modified files calib3d.hpp and camera_calibration_and_3d_reconstruction.rst. 
						
						
					 
					
						2014-04-26 20:13:27 -04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						721d0145e0 
					 
					
						
						
							
							Merge pull request  #2002  from abak:stereo_calibrate  
						
						
						
						
					 
					
						2014-02-05 17:47:27 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						7cfb7bc8cd 
					 
					
						
						
							
							Merge pull request  #2120  from prclibo:master  
						
						
						
						
					 
					
						2014-02-03 16:59:04 +04:00 
						 
				 
			
				
					
						
							
							
								Bo Li 
							
						 
					 
					
						
						
							
						
						d155639db5 
					 
					
						
						
							
							grammar fix  
						
						
						
						
					 
					
						2014-01-07 09:57:40 +08:00 
						 
				 
			
				
					
						
							
							
								Bo Li 
							
						 
					 
					
						
						
							
						
						d444af5bb2 
					 
					
						
						
							
							updated decomposeEssentialMat doc  
						
						
						
						
					 
					
						2014-01-07 09:54:12 +08:00 
						 
				 
			
				
					
						
							
							
								Adrien BAK 
							
						 
					 
					
						
						
							
						
						6ae16ebec3 
					 
					
						
						
							
							update doc accordingly  
						
						
						
						
					 
					
						2013-12-17 16:51:33 +09:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						bd70a033fc 
					 
					
						
						
							
							Boring changes - calib3d.  
						
						
						
						
					 
					
						2013-09-05 18:26:43 +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 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						f55740da70 
					 
					
						
						
							
							Deleted all trailing whitespace.  
						
						
						
						
					 
					
						2013-08-21 18:59:24 +04:00