| 
							
							
								 Philipp Hasper | 30742d21d8 | CUDA optical flow stubs: missing parameter | 2014-08-25 14:49:21 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 6207d338dd | merged new master branch changed tests for tvl1 optflow
correction of a bug preventing compilation with cuda (fmin changed to fminf) | 2014-08-18 15:29:45 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 7b8bb4248b | Merge branch 'cuda_concurrency' into tvl1_chambolle | 2014-07-31 16:08:57 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 917107e635 | removed bm legacy | 2014-07-31 16:01:54 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 5623701acb | performance issue for cuda TVL1 when gamma = 0 | 2014-07-28 14:24:21 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | df8f1a4355 | removed legacy header | 2014-07-28 10:58:19 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 62fed8b7b2 | retry after failure to load from the build bot | 2014-07-07 12:55:07 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 5c8e679bdc | still a couple tabs and trailing whitespaces... | 2014-07-07 12:34:23 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | eb6c598678 | changed nullptr to NULL to avoid c++11 (failed to build on linux) replaces tabs with spaces | 2014-07-07 09:32:48 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 4bd55c6f73 | added comments and reference for Chambolle paper | 2014-07-04 15:33:34 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 693c4e5741 | debug of cuda_tvl1 => pass tests succesfully | 2014-07-04 14:23:09 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 3e577b090e | removed legacy from cmake dependency removed legacy tests in cudaoptflow | 2014-07-03 15:26:51 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 1ea1cafa00 | added modification on cudaoptflow/include/opencv2/cudaoptflow.hpp | 2014-07-03 12:07:19 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | b66a13183e | added cuda support for chambolle parameter | 2014-07-02 17:06:52 +02:00 |  | 
			
				
					| 
							
							
								 Andrey Pavlenko | 724f5e7f19 | Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ONif need them) | 2014-06-16 11:18:52 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | 029ffb7c2d | Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp | 2014-02-17 15:24:05 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | cdc10defa3 | Merge commit '05b9c991dd' into merge-2.4 Conflicts:
	modules/cuda/test/test_objdetect.cpp
	modules/gpu/perf/perf_core.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpu/test/test_core.cpp | 2013-12-30 17:30:59 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | d58cd9851f | Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py | 2013-12-03 17:35:21 +04:00 |  | 
			
				
					| 
							
							
								 Vladislav Vinogradov | 1ad4592bfc | Merge branch 'master' into gpu-cuda-rename Conflicts:
	modules/cudaoptflow/perf/perf_optflow.cpp
	modules/cudaoptflow/src/tvl1flow.cpp
	samples/gpu/stereo_multi.cpp | 2013-09-04 09:58:32 +04:00 |  | 
			
				
					| 
							
							
								 Vladislav Vinogradov | 429bfad225 | removed precomp.cpp files | 2013-09-02 14:00:44 +04:00 |  | 
			
				
					| 
							
							
								 Vladislav Vinogradov | cbe437571e | fixed docs | 2013-09-02 14:00:44 +04:00 |  | 
			
				
					| 
							
							
								 Vladislav Vinogradov | fd88654b45 | replaced GPU -> CUDA | 2013-09-02 14:00:44 +04:00 |  | 
			
				
					| 
							
							
								 Vladislav Vinogradov | 3c34b24f1f | replaced gpu->cuda in files names | 2013-09-02 14:00:44 +04:00 |  | 
			
				
					| 
							
							
								 Vladislav Vinogradov | 5660d6a680 | renamed gpuoptflow -> cudaoptflow | 2013-09-02 14:00:43 +04:00 |  |