Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						771af4f32d 
					 
					
						
						
							
							Some changes to support mingw-w64  
						
						 
						
						... 
						
						
						
						- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes  #5253 ) 
						
						
					 
					
						2015-09-01 00:59:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						ce0e595a4f 
					 
					
						
						
							
							move the rest cuda functions to cuda legacy  
						
						 
						
						
						
						
					 
					
						2015-01-22 15:02:21 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						b416e8715d 
					 
					
						
						
							
							move labeling routines from cuda to cudalegacy  
						
						 
						
						
						
						
					 
					
						2015-01-22 15:02:20 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						19c6bbe7d9 
					 
					
						
						
							
							move obsolete algorithms from cudaoptflow to cudalegacy  
						
						 
						
						
						
						
					 
					
						2015-01-21 15:50:21 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						dae188d14f 
					 
					
						
						
							
							move obsolete algorithms from cudabgsegm to cudalegacy:  
						
						 
						
						... 
						
						
						
						* GMG
* FGD 
						
						
					 
					
						2015-01-19 14:17:00 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						4cc7b0a74f 
					 
					
						
						
							
							move ImagePyramid to cudalegacy  
						
						 
						
						
						
						
					 
					
						2015-01-13 18:00:26 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						03e213ccae 
					 
					
						
						
							
							Doxygen documentation: BiB references and fixes  
						
						 
						
						
						
						
					 
					
						2014-12-01 15:50:55 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						ceb6e8bd94 
					 
					
						
						
							
							Doxygen documentation: cuda  
						
						 
						
						
						
						
					 
					
						2014-12-01 15:47:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						4f1aed98de 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						 
						
						... 
						
						
						
						Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp 
						
						
					 
					
						2013-11-11 16:55:36 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						6d216d78d9 
					 
					
						
						
							
							renamed gpulegacy -> cudalegacy  
						
						 
						
						
						
						
					 
					
						2013-09-02 14:00:42 +04:00