Cosmin Boaca 
							
						 
					 
					
						
						
							
						
						e6f86ea39d 
					 
					
						
						
							
							Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier  
						
						
						
						
					 
					
						2014-01-30 13:32:32 +02:00 
						 
				 
			
				
					
						
							
							
								Cosmin Boaca 
							
						 
					 
					
						
						
							
						
						97092e31bc 
					 
					
						
						
							
							Added result_probabilities parameter to CvNormalBayesClassifier::predict method. Issue  #3401  
						
						
						
						
					 
					
						2014-01-29 13:57:51 +02:00 
						 
				 
			
				
					
						
							
							
								Cosmin Boaca 
							
						 
					 
					
						
						
							
						
						3985980b2f 
					 
					
						
						
							
							Added returnDFVal parameter to parallel CvSVM::predict function  
						
						
						
						
					 
					
						2014-01-28 11:54:39 +02:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						c8afe7efc6 
					 
					
						
						
							
							Merge pull request  #1320  from mbarnach:svm_hog  
						
						
						
						
					 
					
						2014-01-21 19:23:04 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						37789f015a 
					 
					
						
						
							
							deleted excess semicolons, commas  
						
						
						
						
					 
					
						2014-01-18 01:31:33 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						9c2272d520 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp 
						
						
					 
					
						2013-11-26 15:05:26 +04:00 
						 
				 
			
				
					
						
							
							
								Mathieu Barnachon 
							
						 
					 
					
						
						
							
						
						63c23cce65 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into svm_hog  
						
						
						
						
					 
					
						2013-11-24 13:24:39 +01:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						cf00349b5b 
					 
					
						
						
							
							Gave CvSVM a private copy constructor & assignment operator.  
						
						... 
						
						
						
						The implicitly generated ones don't work properly, and I don't want to
write proper ones. :-)
"Fixes" <http://code.opencv.org/issues/3358 >. 
						
						
					 
					
						2013-11-20 14:59:42 +04:00 
						 
				 
			
				
					
						
							
							
								Mathieu Barnachon 
							
						 
					 
					
						
						
							
						
						0934344a3d 
					 
					
						
						
							
							Update sample and code with external computation of HOG detector.  
						
						
						
						
					 
					
						2013-09-12 18:38:49 +02:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						345bc633cc 
					 
					
						
						
							
							Boring changes - ml.  
						
						
						
						
					 
					
						2013-09-05 18:26:44 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						e59c74e1c7 
					 
					
						
						
							
							Merge pull request  #1348  from SpecLad:merge-2.4  
						
						
						
						
					 
					
						2013-08-28 13:41:41 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						9ed475cf52 
					 
					
						
						
							
							War on Whitespace, master edition: file endings.  
						
						
						
						
					 
					
						2013-08-27 14:23:26 +04:00 
						 
				 
			
				
					
						
							
							
								Maria Dimashova 
							
						 
					 
					
						
						
							
						
						989be02562 
					 
					
						
						
							
							fixed cpp wrappers of ML tree-based models  
						
						
						
						
					 
					
						2013-08-23 18:13:10 +04:00 
						 
				 
			
				
					
						
							
							
								Mathieu Barnachon 
							
						 
					 
					
						
						
							
						
						7f3273c77f 
					 
					
						
						
							
							Adding an export for HOGDetector compatibility.  
						
						... 
						
						
						
						An SVM train with HOG could export a single vector for HOGDetector. 
						
						
					 
					
						2013-08-22 15:00:32 +12:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						4143071e22 
					 
					
						
						
							
							In CvBoost, delegated update_weights's implementation to a helper method.  
						
						... 
						
						
						
						This allows subclasses of CvBoost to override initial weights that
update_weights uses without duplicating its entire implementation. 
						
						
					 
					
						2013-04-11 13:50:10 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						2b1ef95415 
					 
					
						
						
							
							Completely separate C and C++ API of OpenCV core  
						
						
						
						
					 
					
						2013-04-01 15:24:34 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						75513a46dc 
					 
					
						
						
							
							Remove all include directives for <string>  
						
						
						
						
					 
					
						2013-03-22 22:14:47 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						2ad7b97f1c 
					 
					
						
						
							
							All modules (except ocl and gpu) compiles and pass tests  
						
						
						
						
					 
					
						2013-03-22 22:14:26 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						1ca8f33b4e 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-03-21 23:11:54 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						a06af5ca25 
					 
					
						
						
							
							dramatic speedup of SVM::predict in the case of linear SVM  
						
						
						
						
					 
					
						2013-03-19 18:28:17 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						a42a0f5fca 
					 
					
						
						
							
							Added compatibility headers  
						
						
						
						
					 
					
						2013-03-13 17:26:56 +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 
						 
				 
			
				
					
						
							
							
								cuda-geek 
							
						 
					 
					
						
						
							
						
						15e125c751 
					 
					
						
						
							
							Merge pull request  #543  from taka-no-me:explicit_stl  
						
						
						
						
					 
					
						2013-02-26 20:54:13 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						2a6fb2867e 
					 
					
						
						
							
							Remove all using directives for STL namespace and members  
						
						... 
						
						
						
						Made all STL usages explicit to be able automatically find all usages of
particular class or function. 
						
						
					 
					
						2013-02-25 15:04:17 +04:00 
						 
				 
			
				
					
						
							
							
								Markus Schoeler 
							
						 
					 
					
						
						
							
						
						7cab6798c0 
					 
					
						
						
							
							Added two kernels to existing SVM framework  
						
						... 
						
						
						
						Histogram intersection kernel (accessible by using SVM::INTER in CV namespace as kernel_type)
Exponetial chi2 kernel (accessible by using SVM::CHI2 in CV namespace as kernel_type)
Formulars:
Exp-CHI2
k(x,y) = exp(-gamma * CHI2(x,y))
CHI2(x,y) = 1- 2* SUM_i[(xi-yi)²/(xi+yi)]
Intersec
k(x,y) = SUM_i[min(xi,yi)] 
						
						
					 
					
						2013-02-14 11:30:30 +01:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						c527340cb6 
					 
					
						
						
							
							Merge branch 2.4  
						
						
						
						
					 
					
						2013-02-04 17:15:55 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						14ac8a528e 
					 
					
						
						
							
							final refactoring and test for training  
						
						
						
						
					 
					
						2013-02-01 14:36:06 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						716a9ccb71 
					 
					
						
						
							
							move training to softcascade module  
						
						... 
						
						
						
						rename Octave -> SoftCascadeOctave 
						
						
					 
					
						2013-02-01 14:36:05 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						8672ae58e2 
					 
					
						
						
							
							fix globbing under win  
						
						
						
						
					 
					
						2013-02-01 14:34:40 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						dc12b4476a 
					 
					
						
						
							
							suppress debug out for soft cascade Octave  
						
						
						
						
					 
					
						2013-02-01 14:34:40 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						e47f58f4ce 
					 
					
						
						
							
							replace Mats to Input/OutputArrays for Octave's public interface  
						
						
						
						
					 
					
						2013-02-01 14:34:40 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						e7bab669fa 
					 
					
						
						
							
							replace cv::Mat to Input/Output arrays  
						
						
						
						
					 
					
						2013-02-01 14:34:40 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						dd8de0c41f 
					 
					
						
						
							
							move soft cascade octave to ml module  
						
						
						
						
					 
					
						2013-02-01 14:34:40 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						a0e93d0482 
					 
					
						
						
							
							move image extraction logic from Octave to Dataset class  
						
						
						
						
					 
					
						2013-02-01 14:34:40 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						a3600b94db 
					 
					
						
						
							
							created abstract FeaturePool class  
						
						
						
						
					 
					
						2013-02-01 14:34:40 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						a8d0e04912 
					 
					
						
						
							
							amplement weidhting according to L. Bourdev and J. Brandt paper "Robust Object Detection Via Soft Cascade"  
						
						
						
						
					 
					
						2013-02-01 14:34:39 +04:00 
						 
				 
			
				
					
						
							
							
								LeonidBeynenson 
							
						 
					 
					
						
						
							
						
						6de422701a 
					 
					
						
						
							
							Made changes to allow ml module to work with big data.  
						
						
						
						
					 
					
						2013-01-31 19:37:20 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						edee177ef1 
					 
					
						
						
							
							Fix binary compatibility of opencv_ml  
						
						
						
						
					 
					
						2012-10-17 02:09:23 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						7d6a2f1bca 
					 
					
						
						
							
							Revert "skip of table header in MLData ( #1962 )"  
						
						... 
						
						
						
						This reverts commit 4d36be8794 
						
						
					 
					
						2012-10-17 02:09:20 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						0dc3d61071 
					 
					
						
						
							
							Revert "yet another portion of changes towards the binary compatibility"  
						
						... 
						
						
						
						This reverts commit 618fbf5508 
						
						
					 
					
						2012-10-17 02:09:17 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e7b81688a4 
					 
					
						
						
							
							Revert "yet another portion of changes towards the binary compatibility"  
						
						... 
						
						
						
						This reverts commit 618fbf5508 
						
						
					 
					
						2012-10-16 19:35:57 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						18ab16dbd3 
					 
					
						
						
							
							Revert "some more fixes towards binary compatibility"  
						
						... 
						
						
						
						This reverts commit a8c5e35619 
						
						
					 
					
						2012-10-16 19:35:28 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						a8c5e35619 
					 
					
						
						
							
							some more fixes towards binary compatibility  
						
						
						
						
					 
					
						2012-10-09 15:56:16 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						618fbf5508 
					 
					
						
						
							
							yet another portion of changes towards the binary compatibility  
						
						
						
						
					 
					
						2012-10-08 21:36:27 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						f268af8ef0 
					 
					
						
						
							
							Removed remaining SWIG marks from headers  
						
						
						
						
					 
					
						2012-09-07 22:19:43 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						a98d6b6217 
					 
					
						
						
							
							exposed parallelized SVM prediction to python (predict_all)  
						
						
						
						
					 
					
						2012-06-14 10:02:49 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						f2d3b9b4a1 
					 
					
						
						
							
							Warning fixes continued  
						
						
						
						
					 
					
						2012-06-09 15:00:04 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						eb2f1f81ed 
					 
					
						
						
							
							Fixed hundreds of documentation problems  
						
						
						
						
					 
					
						2012-05-28 07:36:14 +00:00 
						 
				 
			
				
					
						
							
							
								Maria Dimashova 
							
						 
					 
					
						
						
							
						
						4d36be8794 
					 
					
						
						
							
							skip of table header in MLData ( #1962 )  
						
						
						
						
					 
					
						2012-05-19 14:34:36 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						9bbcebd6b0 
					 
					
						
						
							
							added opencv_world module that combines all the other [selected by user] OpenCV modules, except for opencv_python and opencv_gpu.  
						
						
						
						
					 
					
						2012-05-12 13:54:26 +00:00