Maksim Shabunin
							
						 
					 | 
					
						
						
							
						
						03e213ccae
					 | 
					
						
						
							
							Doxygen documentation: BiB references and fixes
						
						
						
						
						
						
					 | 
					
						2014-12-01 15:50:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Maksim Shabunin
							
						 
					 | 
					
						
						
							
						
						9d89f8d3dc
					 | 
					
						
						
							
							Doxygen documentation: shape, superres, videostab
						
						
						
						
						
						
					 | 
					
						2014-12-01 15:47:13 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						6ad4823f0c
					 | 
					
						
						
							
							ported superres to T-API
						
						
						
						
						
						
					 | 
					
						2014-02-01 17:20:18 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladislav Vinogradov
							
						 
					 | 
					
						
						
							
						
						fd88654b45
					 | 
					
						
						
							
							replaced GPU -> CUDA
						
						
						
						
						
						
					 | 
					
						2013-09-02 14:00:44 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Donchenko
							
						 
					 | 
					
						
						
							
						
						dcaf923517
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4'
						
						
						
						
						
						
						
						Conflicts:
	3rdparty/ffmpeg/ffmpeg_version.cmake
	cmake/OpenCVFindLibsGrfmt.cmake
	cmake/templates/cvconfig.h.cmake
	modules/bioinspired/doc/retina/index.rst
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/calib3d/src/precomp.hpp
	modules/contrib/src/inputoutput.cpp
	modules/contrib/src/precomp.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/types_c.h
	modules/core/src/drawing.cpp
	modules/core/src/precomp.hpp
	modules/core/src/system.cpp
	modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
	modules/features2d/doc/common_interfaces_of_feature_detectors.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/src/precomp.hpp
	modules/flann/src/precomp.hpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/src/precomp.hpp
	modules/gpu/test/test_imgproc.cpp
	modules/highgui/CMakeLists.txt
	modules/highgui/test/test_precomp.hpp
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/precomp.hpp
	modules/java/generator/src/cpp/Mat.cpp
	modules/legacy/src/precomp.hpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/ml/src/precomp.hpp
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/src/precomp.hpp
	modules/objdetect/include/opencv2/objdetect/objdetect.hpp
	modules/objdetect/src/cascadedetect.cpp
	modules/objdetect/src/hog.cpp
	modules/objdetect/src/precomp.hpp
	modules/objdetect/test/test_latentsvmdetector.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/opencl/objdetect_hog.cl
	modules/ocl/src/precomp.hpp
	modules/photo/src/precomp.hpp
	modules/stitching/src/precomp.hpp
	modules/superres/perf/perf_precomp.hpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	modules/superres/test/test_precomp.hpp
	modules/ts/include/opencv2/ts.hpp
	modules/video/src/precomp.hpp
	modules/videostab/src/precomp.hpp
	modules/world/src/precomp.hpp 
						
						
					 | 
					
						2013-08-06 13:56:49 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jin Ma
							
						 
					 | 
					
						
						
							
						
						027b8021b1
					 | 
					
						
						
							
							Added farneback to superres module.
						
						
						
						
						
						
					 | 
					
						2013-07-26 14:14:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Donchenko
							
						 
					 | 
					
						
						
							
						
						feaa12a274
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4
						
						
						
						
						
						
						
						Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp 
						
						
					 | 
					
						2013-07-16 11:52:41 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								peng xiao
							
						 
					 | 
					
						
						
							
						
						9b3c318e85
					 | 
					
						
						
							
							Add super resolution's OpenCL implementation.
						
						
						
						
						
						
						
						Accuracy and performance tests are also provided. 
						
						
					 | 
					
						2013-06-26 08:43:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						f77a375354
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-03-29 19:38:35 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						be7bbe3aa9
					 | 
					
						
						
							
							Drop cv:: prefix from cv::String used inside the cv namespace
						
						
						
						
						
						
					 | 
					
						2013-03-22 22:14:50 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						2ad7b97f1c
					 | 
					
						
						
							
							All modules (except ocl and gpu) compiles and pass tests
						
						
						
						
						
						
					 | 
					
						2013-03-22 22:14:26 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladislav Vinogradov
							
						 
					 | 
					
						
						
							
						
						f0b19d4659
					 | 
					
						
						
							
							updated license header in whole gpu module
						
						
						
						
						
						
					 | 
					
						2013-03-22 14:03:15 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						1ca8f33b4e
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-03-21 23:11:54 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladislav Vinogradov
							
						 
					 | 
					
						
						
							
						
						7a0d6f7733
					 | 
					
						
						
							
							Super Resolution module
						
						
						
						
						
						
					 | 
					
						2013-02-27 13:41:15 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |