Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						6c2d77079f 
					 
					
						
						
							
							Merge pull request  #2487  from ilya-lavrenov:tapi_perf_orb  
						
						
						
						
					 
					
						2014-03-31 18:17:50 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						c53398a438 
					 
					
						
						
							
							performance tests for FAST  
						
						
						
						
					 
					
						2014-03-31 15:03:00 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						b73490f86c 
					 
					
						
						
							
							eliminated restriction src[i].channels() == 1 in cv::merge  
						
						
						
						
					 
					
						2014-03-19 13:56:31 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						95a55453df 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	modules/calib3d/perf/perf_pnp.cpp
	modules/contrib/src/imagelogpolprojection.cpp
	modules/contrib/src/templatebuffer.hpp
	modules/core/perf/opencl/perf_gemm.cpp
	modules/cudafeatures2d/doc/feature_detection_and_description.rst
	modules/cudafeatures2d/perf/perf_features2d.cpp
	modules/cudafeatures2d/src/fast.cpp
	modules/cudafeatures2d/test/test_features2d.cpp
	modules/features2d/doc/feature_detection_and_description.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/imgproc/perf/opencl/perf_blend.cpp
	modules/imgproc/perf/opencl/perf_color.cpp
	modules/imgproc/perf/opencl/perf_moments.cpp
	modules/imgproc/perf/opencl/perf_pyramid.cpp
	modules/objdetect/perf/opencl/perf_hogdetect.cpp
	modules/ocl/perf/perf_arithm.cpp
	modules/ocl/perf/perf_bgfg.cpp
	modules/ocl/perf/perf_blend.cpp
	modules/ocl/perf/perf_brute_force_matcher.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/perf/perf_gftt.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_imgwarp.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_matrix_operation.cpp
	modules/ocl/perf/perf_ml.cpp
	modules/ocl/perf/perf_moments.cpp
	modules/ocl/perf/perf_opticalflow.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/video/src/lkpyramid.cpp
	modules/video/src/precomp.hpp
	samples/gpu/morphology.cpp 
						
						
					 
					
						2014-03-11 17:20:01 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						099ea91823 
					 
					
						
						
							
							typos  
						
						
						
						
					 
					
						2014-03-04 12:47:40 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						48432502b6 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt 
						
						
					 
					
						2014-02-25 15:02:24 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						aa5311ea9f 
					 
					
						
						
							
							backport of master-based perf tests for matchTemplate to 2.4  
						
						
						
						
					 
					
						2014-02-20 18:58:32 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						9885a671ee 
					 
					
						
						
							
							Merge pull request  #2346  from ilya-lavrenov:umat_tests_cleanup  
						
						
						
						
					 
					
						2014-02-17 17:53:05 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						7629bb78a4 
					 
					
						
						
							
							extended performance tests to test 3 channels  
						
						
						
						
					 
					
						2014-02-16 01:31:33 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						9b627a5e9f 
					 
					
						
						
							
							disabled 'reshape', 'copyTo' test  
						
						
						
						
					 
					
						2014-02-15 20:17:42 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						4f36bc29d9 
					 
					
						
						
							
							cleaned-up UMat tests  
						
						
						
						
					 
					
						2014-02-15 15:51:52 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						2e8579fe9b 
					 
					
						
						
							
							cleaned up super_resolution sample from old OCL  
						
						
						
						
					 
					
						2014-02-05 00:28:10 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						6ad4823f0c 
					 
					
						
						
							
							ported superres to T-API  
						
						
						
						
					 
					
						2014-02-01 17:20:18 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						b0caa588ec 
					 
					
						
						
							
							Merge pull request  #2190  from KonstantinMatskevich:ocl_dumpinfo  
						
						
						
						
					 
					
						2014-01-24 16:44:19 +04:00 
						 
				 
			
				
					
						
							
							
								Konstantin Matskevich 
							
						 
					 
					
						
						
							
						
						f90e41d54e 
					 
					
						
						
							
							dumpinfo  
						
						
						
						
					 
					
						2014-01-22 17:04:44 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						99942e8043 
					 
					
						
						
							
							Merge pull request  #2166  from ilya-lavrenov:tapi_gftt  
						
						
						
						
					 
					
						2014-01-21 22:29:41 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						5abfd40989 
					 
					
						
						
							
							added perf test for cv::goodFeaturesToTrack  
						
						
						
						
					 
					
						2014-01-20 13:57:53 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						5d18cf9989 
					 
					
						
						
							
							added cv::[extract|insert]Channel to T-API  
						
						
						
						
					 
					
						2014-01-20 13:52:07 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						79fcc06a4b 
					 
					
						
						
							
							Merge pull request  #2146  from SpecLad:merge-2.4  
						
						
						
						
					 
					
						2014-01-17 16:28:30 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						93a818684c 
					 
					
						
						
							
							ported cv::Canny to T-API  
						
						
						
						
					 
					
						2014-01-17 11:13:28 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						82d3efc6c0 
					 
					
						
						
							
							added perf test for cv::Canny  
						
						
						
						
					 
					
						2014-01-15 20:06:24 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						fee2ed37fc 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp 
						
						
					 
					
						2014-01-14 11:53:59 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						a7a7b80ff8 
					 
					
						
						
							
							added perf test for cv::Moments  
						
						
						
						
					 
					
						2014-01-13 17:50:14 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						dd302158e0 
					 
					
						
						
							
							fixed case with zero mask  
						
						
						
						
					 
					
						2014-01-09 19:26:09 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						6b9ebcbf3d 
					 
					
						
						
							
							deleted extra semicolons  
						
						
						
						
					 
					
						2014-01-07 02:52:30 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						c8a52daafd 
					 
					
						
						
							
							Merge pull request  #2054  from alalek:ocl_tapi_dev_selection  
						
						
						
						
					 
					
						2013-12-26 17:27:06 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						d7c22343aa 
					 
					
						
						
							
							added perf tests for T-API core functions  
						
						
						
						
					 
					
						2013-12-25 18:19:40 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						e49065b1dc 
					 
					
						
						
							
							core/ocl: temporary move device selection from ocl module  
						
						
						
						
					 
					
						2013-12-25 16:17:40 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						f3e2bfea79 
					 
					
						
						
							
							Merge pull request  #1970  from ilya-lavrenov:tapi_checks  
						
						
						
						
					 
					
						2013-12-11 21:37:10 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						8fa8b36b42 
					 
					
						
						
							
							added cv::Laplacian, cv::Sobel, cv::Scharr, cv::GaussianBlur to T-API  
						
						
						
						
					 
					
						2013-12-10 23:20:28 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						5566d31468 
					 
					
						
						
							
							more strict checks outside ROI  
						
						
						
						
					 
					
						2013-12-10 19:30:14 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						e2b99a32b2 
					 
					
						
						
							
							added cv::threshold to T-API  
						
						
						
						
					 
					
						2013-12-04 13:45:44 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						5b5f5878ce 
					 
					
						
						
							
							added tests to imgproc  
						
						
						
						
					 
					
						2013-12-04 13:41:34 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						f9190cc662 
					 
					
						
						
							
							Merge pull request  #1909  from alalek:ocl_tapi_perf  
						
						
						
						
					 
					
						2013-12-04 11:35:11 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						803672feea 
					 
					
						
						
							
							added cv::remap to T-API  
						
						
						
						
					 
					
						2013-12-04 00:43:43 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						7d9150460a 
					 
					
						
						
							
							core/ocl: added perf test infra + "Add" perf test  
						
						
						
						
					 
					
						2013-12-03 18:43:50 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						fe01bc21c0 
					 
					
						
						
							
							perf: test-based metrics collection strategy  
						
						
						
						
					 
					
						2013-12-03 18:43:50 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						cb4267cb38 
					 
					
						
						
							
							ts/perf: int -> enum WarmUpType  
						
						
						
						
					 
					
						2013-12-03 12:40:31 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						206b56ed39 
					 
					
						
						
							
							ts: catch & append general exceptions into log  
						
						
						
						
					 
					
						2013-12-03 03:40:56 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						b27d7d2a61 
					 
					
						
						
							
							Merge pull request  #1886  from ilya-lavrenov:tapi_lut  
						
						
						
						
					 
					
						2013-12-02 12:28:18 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						09795e3265 
					 
					
						
						
							
							added cv::resize INTER_AREA to T-API  
						
						
						
						
					 
					
						2013-11-29 17:57:37 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						4eba74ee19 
					 
					
						
						
							
							added cv::LUT to T-API  
						
						
						
						
					 
					
						2013-11-28 12:31:04 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						41ae5d5f66 
					 
					
						
						
							
							Merge pull request  #1867  from ilya-lavrenov:ocl_resize_master  
						
						
						
						
					 
					
						2013-11-27 18:08:11 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						6679aed61e 
					 
					
						
						
							
							fixed ocl::resize (INTER_LINEAR) and added an accuracy test  
						
						
						
						
					 
					
						2013-11-27 02:52:02 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						9d23a0cb81 
					 
					
						
						
							
							fixed ocl_arithm_op; fix for 3-channel images is needed  
						
						
						
						
					 
					
						2013-11-25 14:21:12 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						881e837520 
					 
					
						
						
							
							ocl/core: added prototype for tests  
						
						
						
						
					 
					
						2013-11-22 18:37:44 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						aacf188e83 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_color.cpp
	samples/cpp/3calibration.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/camshiftdemo.cpp
	samples/cpp/descriptor_extractor_matcher.cpp
	samples/cpp/distrans.cpp
	samples/cpp/generic_descriptor_match.cpp
	samples/cpp/grabcut.cpp
	samples/cpp/morphology2.cpp
	samples/cpp/segment_objects.cpp
	samples/cpp/stereo_calib.cpp
	samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
	samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
	samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
	samples/cpp/video_dmtx.cpp 
						
						
					 
					
						2013-11-19 16:21:09 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						f1873bbca1 
					 
					
						
						
							
							perf tests: allow to skip performance tests  
						
						
						
						
					 
					
						2013-11-13 14:17:56 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						e845184843 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/2.4' into merge-2.4  
						
						... 
						
						
						
						* #1538  from StevenPuttemans:bugfix_3283
* #1545  from alalek:ocl_test_fix_rng
* #1551  from alalek:cmake_install_win
* #1570  from ilya-lavrenov:ipp_warn_fix
* #1573  from alalek:perf_simple_strategy
* #1574  from alalek:svm_workaround
* #1576  from alalek:ocl_fix_cl_double
* #1577  from ilya-lavrenov:ocl_setto_opencl12
* #1578  from asmorkalov:android_fd_cp_fix
* #1579  from ilya-lavrenov:ocl_norm
* #1582  from sperrholz:ocl-arithm-additions
* #1586  from ilya-lavrenov:ocl_setto_win_fix
* #1589  from ilya-lavrenov:pr1582_fix
* #1591  from alalek:ocl_remove_cl_hpp_h
* #1592  from alalek:ocl_program_cache_update
* #1593  from ilya-lavrenov:ocl_war_on_double
* #1594  from ilya-lavrenov:ocl_perf
* #1595  from alalek:cl_code_cleanup
* #1596  from alalek:test_fix_run_py
* #1597  from alalek:ocl_fix_cleanup
* #1598  from alalek:ocl_fix_build_mac
* #1599  from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601  from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602  from alalek:ocl_test_dump_info
* #1603  from ilya-lavrenov:ocl_disable_svm_noblas
* #1605  from alalek:ocl_fixes
* #1606  from ilya-lavrenov:ocl_imgproc
* #1607  from ilya-lavrenov:ocl_fft_cleanup
* #1608  from alalek:fix_warn_upd_haar
* #1609  from ilya-lavrenov:ocl_some_optimization
* #1610  from alalek:ocl_fix_perf_kalman
* #1612  from alalek:ocl_fix_string_info
* #1614  from ilya-lavrenov:ocl_svm_misprint
* #1616  from ilya-lavrenov:ocl_cvtColor
* #1617  from ilya-lavrenov:ocl_info
* #1622  from a0byte:2.4
* #1625  from ilya-lavrenov:to_string
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVGenConfig.cmake
	modules/core/CMakeLists.txt
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/fft.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/gemm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_fft.cpp
	modules/ocl/test/test_moments.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_optflow.cpp
	modules/ocl/test/utility.hpp
	modules/python/CMakeLists.txt
	modules/ts/include/opencv2/ts.hpp
	modules/ts/src/ts_perf.cpp
	samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp 
						
						
					 
					
						2013-10-15 20:08:52 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						376cd8f84f 
					 
					
						
						
							
							perf: added simple collection strategy  
						
						
						
						
					 
					
						2013-10-12 18:05:57 +04:00