alexandre benoit 
							
						 
					 
					
						
						
							
						
						7fe78efda3 
					 
					
						
						
							
							retina included in namespace bioinspired + followed suggestions made by Vadim  
						
						
						
						
					 
					
						2013-07-14 19:28:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Angelov 
							
						 
					 
					
						
						
							
						
						22c8010b2d 
					 
					
						
						
							
							Added needed header, changed macro name.  
						
						
						
						
					 
					
						2013-07-14 12:56:22 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Angelov 
							
						 
					 
					
						
						
							
						
						6bd5e12be3 
					 
					
						
						
							
							Added a sample to show usage of the class.  
						
						
						
						
					 
					
						2013-07-13 04:11:27 +03:00 
						 
				 
			
				
					
						
							
							
								alexandre benoit 
							
						 
					 
					
						
						
							
						
						188f889949 
					 
					
						
						
							
							Merge branch 'master' of code.opencv.org:opencv  
						
						
						
						
					 
					
						2013-07-04 16:19:24 +02:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						4cf9990d4e 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	doc/tutorials/definitions/noContent.rst
	doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
	doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
	doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/gpu/CMakeLists.txt
	modules/highgui/perf/perf_output.cpp
	modules/highgui/test/test_video_io.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/opencl/moments.cl
	modules/ocl/test/main.cpp
	modules/ocl/test/test_moments.cpp
	modules/python/test/test.py
	modules/ts/include/opencv2/ts/ts_perf.hpp
	modules/ts/src/precomp.hpp
	modules/ts/src/ts_perf.cpp 
						
						
					 
					
						2013-07-03 19:53:21 +04:00 
						 
				 
			
				
					
						
							
							
								Alexey Spizhevoy 
							
						 
					 
					
						
						
							
						
						37ea872204 
					 
					
						
						
							
							added handling of camera parameters estimation errors ( #3122 )  
						
						
						
						
					 
					
						2013-07-03 15:20:14 +04:00 
						 
				 
			
				
					
						
							
							
								Kirill Kornyakov 
							
						 
					 
					
						
						
							
						
						aef347e7b3 
					 
					
						
						
							
							Removed references to opencv.itseez.com  
						
						
						
						
					 
					
						2013-06-28 12:48:12 +04:00 
						 
				 
			
				
					
						
							
							
								Kirill Kornyakov 
							
						 
					 
					
						
						
							
						
						cbed07bc18 
					 
					
						
						
							
							Removed references to YG from samples  
						
						
						
						
					 
					
						2013-06-28 12:21:52 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						91c519467d 
					 
					
						
						
							
							WinRT build fix for samples and static libs.  
						
						
						
						
					 
					
						2013-06-25 03:36:07 -07:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						b20c9ad2d1 
					 
					
						
						
							
							Merge pull request  #1015  from SpecLad:merge-2.4  
						
						
						
						
					 
					
						2013-06-21 17:38:04 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						13cd0a0502 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4'  
						
						... 
						
						
						
						Original pull requests:
	#996  from jet47:gpu-nvcuvid-libraries
	#995  from jet47:fix-bug-2985
	#999  from snosov1:unreliable-results-fix
	#1005  from alekcac:doc_fix
	#1004  from jet47:fix-bug-3068
	#987  from jet47:bug-3085-fix
	#969  from pengx17:2.4_binary_cache
	#929  from dominikrose:mingw-libdc1394-2-windows
	#1000  from ivan-korolev:fix_sift_bug_2892
	#1001  from ivan-korolev:fix_stitching_bug_2405
	#998  from asmorkalov:android_cmake_mips_fix
	#993  from ivan-korolev:fix_videostab_bug_3023
	#988  from snosov1:3071-fix
	#986  from pengx17:2.4_initiated_context
	#982  from pengx17:2.4_fix_two_bugs
	#981  from SeninAndrew:ximea_camera_support_fix
	#991  from asmorkalov:android_javadoc_fix
	#972  from jet47:mog2-params-bug-2168
	#980  from SpecLad:include-config
	#973  from pengx17:2.4_oclclahe
	#903  from aks2:2.4
	#968  from asmorkalov:android_na_cproj_fix
	#971  from SpecLad:matchers-ctor
	#970  from asmorkalov:dshow_valid_check_fix
	#965  from apavlenko:fix_java_empty_mats
Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp 
						
						
					 
					
						2013-06-19 15:25:37 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						12ae11e2ff 
					 
					
						
						
							
							refactored Separable Linear Filters  
						
						
						
						
					 
					
						2013-06-14 17:25:56 +04:00 
						 
				 
			
				
					
						
							
							
								Sergei Nosov 
							
						 
					 
					
						
						
							
						
						982ef83f80 
					 
					
						
						
							
							Fixes bug  #3071 .  
						
						... 
						
						
						
						If we have perfect matches (min_dist == 0.0), then strict comparison
fails. Making it non-strict results in treating perfect matches as
good. 
						
						
					 
					
						2013-06-13 11:51:45 +04:00 
						 
				 
			
				
					
						
							
							
								alexandre benoit 
							
						 
					 
					
						
						
							
						
						2c1fb5fd71 
					 
					
						
						
							
							minor correction after buildbot warnings  
						
						
						
						
					 
					
						2013-06-13 06:55:35 +02:00 
						 
				 
			
				
					
						
							
							
								alexandre benoit 
							
						 
					 
					
						
						
							
						
						7bff79bbeb 
					 
					
						
						
							
							updated demos and tutorial regarding the Retina class transfer to bioinspired module.  
						
						
						
						
					 
					
						2013-06-12 22:43:36 +02:00 
						 
				 
			
				
					
						
							
							
								alexandre benoit 
							
						 
					 
					
						
						
							
						
						cdbbe0dfbe 
					 
					
						
						
							
							1. created module bioinspired. 2.transfered Retina module into the new module bioinspired. 3. added a fast tone mapping method to Retina interface and wrapped existing reinafilter dedicated method  
						
						
						
						
					 
					
						2013-06-12 22:40:43 +02:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						76f4b02b06 
					 
					
						
						
							
							refactored gpu::Stream (minor fixes)  
						
						
						
						
					 
					
						2013-06-10 12:40:31 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						3eeaa9189c 
					 
					
						
						
							
							Revert "Revert "Merge pull request  #836  from jet47:gpu-modules""  
						
						
						
						
					 
					
						2013-06-07 13:05:39 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						54afb85d0c 
					 
					
						
						
							
							Merge pull request  #823  from pickle27:starter_image_sequence  
						
						
						
						
					 
					
						2013-05-14 15:56:35 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						b8ed00bd64 
					 
					
						
						
							
							Compile OpenCV with GCC visibility set to hidden  
						
						
						
						
					 
					
						2013-05-13 18:33:20 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						8130d92602 
					 
					
						
						
							
							Merge pull request  #841  from Pastafarianist:patch-1  
						
						
						
						
					 
					
						2013-05-12 13:00:23 +04:00 
						 
				 
			
				
					
						
							
							
								alexandre benoit 
							
						 
					 
					
						
						
							
						
						9c26387ce0 
					 
					
						
						
							
							updated sources to correct buildbot warnings  
						
						
						
						
					 
					
						2013-04-30 17:32:47 +02:00 
						 
				 
			
				
					
						
							
							
								alexandre benoit 
							
						 
					 
					
						
						
							
						
						a659e287fb 
					 
					
						
						
							
							minor error correction  
						
						
						
						
					 
					
						2013-04-30 14:52:14 +02:00 
						 
				 
			
				
					
						
							
							
								alexandre benoit 
							
						 
					 
					
						
						
							
						
						72742f5316 
					 
					
						
						
							
							resolved conflicts, updated retina class interface and optimized a heavy retinacolor process  
						
						
						
						
					 
					
						2013-04-29 19:06:35 +02:00 
						 
				 
			
				
					
						
							
							
								alexandre benoit 
							
						 
					 
					
						
						
							
						
						9549949228 
					 
					
						
						
							
							minor chnges for conflict removal  
						
						
						
						
					 
					
						2013-04-29 15:12:44 +02:00 
						 
				 
			
				
					
						
							
							
								albenoit 
							
						 
					 
					
						
						
							
						
						9e1ce1ed52 
					 
					
						
						
							
							Merge pull request  #2  from albenoit/retina_devel  
						
						... 
						
						
						
						Retina devel 
						
						
					 
					
						2013-04-27 13:47:30 -07:00 
						 
				 
			
				
					
						
							
							
								alexandre benoit 
							
						 
					 
					
						
						
							
						
						ea1a64477f 
					 
					
						
						
							
							updated tutorial with new retina interface use  
						
						
						
						
					 
					
						2013-04-27 22:39:28 +02:00 
						 
				 
			
				
					
						
							
							
								alexandre benoit 
							
						 
					 
					
						
						
							
						
						b62d101115 
					 
					
						
						
							
							updated retina interface for cleaner use, following OpenCV standards  
						
						
						
						
					 
					
						2013-04-27 21:13:45 +02:00 
						 
				 
			
				
					
						
							
							
								Kevin Hughes 
							
						 
					 
					
						
						
							
						
						69c626e720 
					 
					
						
						
							
							starter_video.cpp hid local functions  
						
						
						
						
					 
					
						2013-04-22 22:28:35 -04:00 
						 
				 
			
				
					
						
							
							
								Kevin Hughes 
							
						 
					 
					
						
						
							
						
						3441b2df65 
					 
					
						
						
							
							starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error  
						
						
						
						
					 
					
						2013-04-22 16:35:23 -04:00 
						 
				 
			
				
					
						
							
							
								Pastafarianist 
							
						 
					 
					
						
						
							
						
						28427ce2e8 
					 
					
						
						
							
							Fixed typo  
						
						
						
						
					 
					
						2013-04-21 23:04:54 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						416fb50594 
					 
					
						
						
							
							Revert "Merge pull request  #836  from jet47:gpu-modules"  
						
						... 
						
						
						
						This reverts commit fba72cb60d02131ffb62 
						
						
					 
					
						2013-04-18 15:03:50 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						564f609885 
					 
					
						
						
							
							fixed samples compilation  
						
						
						
						
					 
					
						2013-04-18 13:28:34 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						5ee9d3111d 
					 
					
						
						
							
							fixed gpu tutorial  
						
						
						
						
					 
					
						2013-04-18 13:28:34 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						13d087e62d 
					 
					
						
						
							
							videostab module fixes  
						
						
						
						
					 
					
						2013-04-18 13:28:34 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						fdeec6896c 
					 
					
						
						
							
							stitching module fixes  
						
						
						
						
					 
					
						2013-04-18 13:28:30 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						ac0f506d0e 
					 
					
						
						
							
							split gpuvideo onto gpuoptflow and gpubgsegm  
						
						
						
						
					 
					
						2013-04-18 11:33:34 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						eda124ec32 
					 
					
						
						
							
							removed gpuobjdetect module  
						
						
						
						
					 
					
						2013-04-18 11:33:33 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						28b1caa730 
					 
					
						
						
							
							gpustereo module for stereo correspondence  
						
						
						
						
					 
					
						2013-04-18 11:33:33 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						fc3730fcc2 
					 
					
						
						
							
							gpuwarping module for image warping  
						
						
						
						
					 
					
						2013-04-18 11:33:33 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						a6648b5372 
					 
					
						
						
							
							gpuobjdetect module for object detection  
						
						
						
						
					 
					
						2013-04-18 11:33:32 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						b08b9ab83b 
					 
					
						
						
							
							gpucalib3d module for camera calibration and stereo correspondence  
						
						
						
						
					 
					
						2013-04-18 11:33:32 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						fc1fa28556 
					 
					
						
						
							
							gpuvideo module for video processing  
						
						
						
						
					 
					
						2013-04-18 11:33:32 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						7544ddbfef 
					 
					
						
						
							
							gpufeatures2d module 2d for feature detection and matching  
						
						
						
						
					 
					
						2013-04-18 11:33:31 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						e41aea0acf 
					 
					
						
						
							
							gpuimgproc module for image processing  
						
						
						
						
					 
					
						2013-04-18 11:33:31 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						84de6ce036 
					 
					
						
						
							
							gpufilters module for image filtering  
						
						
						
						
					 
					
						2013-04-18 11:33:30 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						31c8b527c6 
					 
					
						
						
							
							gpuarithm module for arithmetics operations on matrices  
						
						
						
						
					 
					
						2013-04-18 11:33:30 +04:00 
						 
				 
			
				
					
						
							
							
								Kevin Hughes 
							
						 
					 
					
						
						
							
						
						47c84335f0 
					 
					
						
						
							
							removed starter_image_sequence.cpp  
						
						
						
						
					 
					
						2013-04-17 13:22:37 -04:00 
						 
				 
			
				
					
						
							
							
								Kevin Hughes 
							
						 
					 
					
						
						
							
						
						eedb6fa3c4 
					 
					
						
						
							
							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  
						
						
						
						
					 
					
						2013-04-17 13:20:32 -04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						54e7c76d99 
					 
					
						
						
							
							fixed compilation errors  
						
						
						
						
					 
					
						2013-04-17 15:24:53 +04:00