Viet Dinh 
							
						 
					 
					
						
						
							
						
						ed0065266e 
					 
					
						
						
							
							update fixing bug  #5599  
						
						
						
						
					 
					
						2015-11-02 08:38:05 -05:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						bf41e791ff 
					 
					
						
						
							
							Merge pull request  #5514  from asmorkalov:as/nonfree-independent-samples  
						
						
						
						
					 
					
						2015-10-15 10:56:23 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						341e7b3be2 
					 
					
						
						
							
							Fixed samples build with nonfree.  
						
						
						
						
					 
					
						2015-10-14 16:19:37 +03:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						bba8c0beac 
					 
					
						
						
							
							Made samples build independent from nonfree module.  
						
						
						
						
					 
					
						2015-10-14 12:56:58 +03:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						ff00220302 
					 
					
						
						
							
							Set of lintain warning fixes for -samples debian package.  
						
						
						
						
					 
					
						2015-10-13 16:32:53 +03:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						58a11ac079 
					 
					
						
						
							
							Merge pull request  #5403  from sturkmen72:patch-9  
						
						
						
						
					 
					
						2015-09-25 12:08:13 +00:00 
						 
				 
			
				
					
						
							
							
								Suleyman TURKMEN 
							
						 
					 
					
						
						
							
						
						69d84c8f3e 
					 
					
						
						
							
							Update how_to_scan_images.cpp  
						
						
						
						
					 
					
						2015-09-25 14:32:58 +03:00 
						 
				 
			
				
					
						
							
							
								Enes Ateş 
							
						 
					 
					
						
						
							
						
						5df2713b16 
					 
					
						
						
							
							XML file path correction  
						
						... 
						
						
						
						in documentation exact path is images/CameraCalibration/VID5
see also PR #5393  
						
						
					 
					
						2015-09-24 10:34:42 +02:00 
						 
				 
			
				
					
						
							
							
								berak 
							
						 
					 
					
						
						
							
						
						851ce27240 
					 
					
						
						
							
							http://code.opencv.org/issues/4359   2.4 branch  
						
						
						
						
					 
					
						2015-06-03 07:48:29 +02:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						08848c56b7 
					 
					
						
						
							
							Merge pull request  #3965  from Dikay900:2_4_diff_to_master_2  
						
						
						
						
					 
					
						2015-04-28 10:47:05 +00:00 
						 
				 
			
				
					
						
							
							
								Pierre Moulon 
							
						 
					 
					
						
						
							
						
						901d4995e3 
					 
					
						
						
							
							Fix a typo error  
						
						... 
						
						
						
						Fix a typo error
Conflicts:
	modules/features2d/include/opencv2/features2d.hpp 
						
						
					 
					
						2015-04-25 15:07:17 +02:00 
						 
				 
			
				
					
						
							
							
								Adi Shavit 
							
						 
					 
					
						
						
							
						
						aad95c7d8c 
					 
					
						
						
							
							Added call to clone() to avoid unexpected change to external data.  
						
						... 
						
						
						
						- Fix both stitching_detailed.cpp sample and cv::Stitcher. 
						
						
					 
					
						2015-04-25 14:54:35 +02:00 
						 
				 
			
				
					
						
							
							
								Dikay900 
							
						 
					 
					
						
						
							
						
						d9b7b300b4 
					 
					
						
						
							
							fix qt example on 2.4 with vs2010 and higher  
						
						
						
						
					 
					
						2015-04-25 14:46:17 +02:00 
						 
				 
			
				
					
						
							
							
								Brian Park 
							
						 
					 
					
						
						
							
						
						044de4105e 
					 
					
						
						
							
							add input paramter checking that verifies the existance of the input files to stero_match example  
						
						... 
						
						
						
						remove the unnecessary header file
check input paramter by checking the image size 
						
						
					 
					
						2015-04-25 14:46:17 +02:00 
						 
				 
			
				
					
						
							
							
								ttagu99 
							
						 
					 
					
						
						
							
						
						a81374c1d7 
					 
					
						
						
							
							findcontour_example check image empty  
						
						
						
						
					 
					
						2015-04-24 21:58:31 +02:00 
						 
				 
			
				
					
						
							
							
								侯骥 
							
						 
					 
					
						
						
							
						
						66fc6126d2 
					 
					
						
						
							
							Update MatchTemplate_Demo.cpp  
						
						
						
						
					 
					
						2015-04-24 21:58:31 +02:00 
						 
				 
			
				
					
						
							
							
								Jay Bosamiya 
							
						 
					 
					
						
						
							
						
						8b58b59df4 
					 
					
						
						
							
							Fix typo  
						
						
						
						
					 
					
						2015-04-24 21:58:30 +02:00 
						 
				 
			
				
					
						
							
							
								RafaRuiz 
							
						 
					 
					
						
						
							
						
						f0595b8254 
					 
					
						
						
							
							Update lkdemo.cpp because of memory leak  
						
						... 
						
						
						
						In MacOSx x64 it was getting a memory leak even without initializing points:
http://code.opencv.org/issues/4250  
						
						
					 
					
						2015-04-24 21:58:29 +02:00 
						 
				 
			
				
					
						
							
							
								Pastafarianist 
							
						 
					 
					
						
						
							
						
						1e01441767 
					 
					
						
						
							
							Fixed typo  
						
						
						
						
					 
					
						2015-04-24 21:58:29 +02:00 
						 
				 
			
				
					
						
							
							
								Dikay900 
							
						 
					 
					
						
						
							
						
						c797746b6e 
					 
					
						
						
							
							use constant instead of value backported from  #785  
						
						
						
						
					 
					
						2015-04-24 21:58:28 +02:00 
						 
				 
			
				
					
						
							
							
								Dikay900 
							
						 
					 
					
						
						
							
						
						1bf4427a5c 
					 
					
						
						
							
							filename correction from  #3217  
						
						
						
						
					 
					
						2015-04-24 21:58:28 +02:00 
						 
				 
			
				
					
						
							
							
								Kevin Hughes 
							
						 
					 
					
						
						
							
						
						ac3ec0d96d 
					 
					
						
						
							
							squashed  #823  
						
						... 
						
						
						
						removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface
Conflicts:
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	samples/cpp/starter_video.cpp
starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error
starter_video.cpp hid local functions 
						
						
					 
					
						2015-04-24 21:58:14 +02:00 
						 
				 
			
				
					
						
							
							
								Maximilien Cuony 
							
						 
					 
					
						
						
							
						
						5c6c537044 
					 
					
						
						
							
							Fix typo in error for extrinsic parameters  
						
						
						
						
					 
					
						2015-04-24 18:39:34 +02:00 
						 
				 
			
				
					
						
							
							
								Dikay900 
							
						 
					 
					
						
						
							
						
						f8c82fc214 
					 
					
						
						
							
							update openni sample comments referring  #81  
						
						
						
						
					 
					
						2015-04-24 18:25:23 +02:00 
						 
				 
			
				
					
						
							
							
								StevenPuttemans 
							
						 
					 
					
						
						
							
						
						3a7ea37090 
					 
					
						
						
							
							extra camera specific information for IP settings  
						
						
						
						
					 
					
						2015-03-10 10:16:13 +01:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						187befd665 
					 
					
						
						
							
							Fixed installation of CMakeLists.txt and enabled GPU samples build in stand alone version.  
						
						
						
						
					 
					
						2015-01-15 14:48:24 +03:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						840088e021 
					 
					
						
						
							
							Get rid of cvconfig.h in Latent SVM samples. Use common OpenCV parallel framework instead of direct TBB calls.  
						
						
						
						
					 
					
						2014-12-30 15:52:23 +03:00 
						 
				 
			
				
					
						
							
							
								doltac 
							
						 
					 
					
						
						
							
						
						6cc5959356 
					 
					
						
						
							
							Fixed typos in latentSVM detector demo.  
						
						
						
						
					 
					
						2014-12-11 19:22:40 +09:00 
						 
				 
			
				
					
						
							
							
								Samyak Datta 
							
						 
					 
					
						
						
							
						
						a3f05474c9 
					 
					
						
						
							
							C++ sample code to detect facial features  
						
						
						
						
					 
					
						2014-11-12 23:35:02 +05:30 
						 
				 
			
				
					
						
							
							
								StevenPuttemans 
							
						 
					 
					
						
						
							
						
						7dce2d0b8f 
					 
					
						
						
							
							fixing cap_pvpapi interface and making sure both AVT Manta and Proscilla  
						
						... 
						
						
						
						series are supported. Testing this with both cams for Windows and Linux
exhaustively.
Optimizing memory footprint by removing unused calls.
Adapted with the input of Shai
Added small example that illustrates how it should work. 
						
						
					 
					
						2014-10-28 15:33:37 +01:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						64d8cf1e2e 
					 
					
						
						
							
							improving face-rec sample:  
						
						... 
						
						
						
						* CSV can contain dir-s and wildcards
* save trained model 
						
						
					 
					
						2014-07-12 19:28:43 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						1f4ddbe5b6 
					 
					
						
						
							
							Merge pull request  #2705  from KonstantinMatskevich:face_recognition_labels_info  
						
						
						
						
					 
					
						2014-06-10 12:24:56 +04:00 
						 
				 
			
				
					
						
							
							
								Konstantin Matskevich 
							
						 
					 
					
						
						
							
						
						8d4a76925c 
					 
					
						
						
							
							fixed binary compatibility  
						
						
						
						
					 
					
						2014-05-21 09:25:15 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						55a714c83b 
					 
					
						
						
							
							fix cv::kmeans function  
						
						... 
						
						
						
						reshape input matrix, since the function works with data
as with [N x dims] matrix 
						
						
					 
					
						2014-05-13 18:00:17 +04:00 
						 
				 
			
				
					
						
							
							
								Konstantin Matskevich 
							
						 
					 
					
						
						
							
						
						aa76ef9a98 
					 
					
						
						
							
							fixes  
						
						
						
						
					 
					
						2014-05-08 15:55:55 +04:00 
						 
				 
			
				
					
						
							
							
								Konstantin Matskevich 
							
						 
					 
					
						
						
							
						
						36afd4ef55 
					 
					
						
						
							
							added additionalInfo in faceRecognition  
						
						
						
						
					 
					
						2014-05-07 16:29:55 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						a489d86e5f 
					 
					
						
						
							
							Merge pull request  #2460  from berak:b_3598_24  
						
						
						
						
					 
					
						2014-03-17 15:52:56 +04:00 
						 
				 
			
				
					
						
							
							
								berak 
							
						 
					 
					
						
						
							
						
						5f94a205d1 
					 
					
						
						
							
							fixed  h / s ranges in histogram_calculation tutorial  
						
						... 
						
						
						
						literalinclude
literalinclude, dropped :lines: 
						
						
					 
					
						2014-03-17 11:01:02 +01:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						099ea91823 
					 
					
						
						
							
							typos  
						
						
						
						
					 
					
						2014-03-04 12:47:40 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						b92a46c130 
					 
					
						
						
							
							some more fixes  
						
						
						
						
					 
					
						2014-02-13 23:47:18 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						879c0196d4 
					 
					
						
						
							
							enabled OpenGL on MacOSX  
						
						
						
						
					 
					
						2014-02-13 00:17:15 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						b8c6adc569 
					 
					
						
						
							
							Merge pull request  #2178  from Nerei:viz_backport  
						
						
						
						
					 
					
						2014-02-03 16:16:51 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						214cbabc40 
					 
					
						
						
							
							update stitching sample  
						
						
						
						
					 
					
						2014-02-03 12:55:03 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						39201e68e2 
					 
					
						
						
							
							Code review notes fixed.  
						
						... 
						
						
						
						Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated. 
						
						
					 
					
						2014-01-27 18:47:09 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						f332cba14b 
					 
					
						
						
							
							OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.  
						
						
						
						
					 
					
						2014-01-27 15:49:24 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						b75cbfde45 
					 
					
						
						
							
							All installed files marked with component names for install customization.  
						
						
						
						
					 
					
						2014-01-21 20:34:36 +04:00 
						 
				 
			
				
					
						
							
							
								Anatoly Baksheev 
							
						 
					 
					
						
						
							
						
						130914d9f4 
					 
					
						
						
							
							fixed documentation warnings  
						
						
						
						
					 
					
						2014-01-21 02:15:37 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						a13e32f5ab 
					 
					
						
						
							
							Merge pull request  #2115  from nghiaho12:kmeans_sample  
						
						
						
						
					 
					
						2014-01-09 16:58:29 +04:00 
						 
				 
			
				
					
						
							
							
								Nghia Ho 
							
						 
					 
					
						
						
							
						
						bf4994554d 
					 
					
						
						
							
							Removed unecessary initialisation of Mat centers.  
						
						
						
						
					 
					
						2014-01-09 21:04:17 +11:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						6b9ebcbf3d 
					 
					
						
						
							
							deleted extra semicolons  
						
						
						
						
					 
					
						2014-01-07 02:52:30 +04:00