Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						a05ce00a65 
					 
					
						
						
							
							Merge pull request  #2879  from alalek:ocl_runtime_flags  
						
						
						
						
					 
					
						2014-08-04 16:43:01 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						962b519708 
					 
					
						
						
							
							Merge pull request  #2996  from akarsakov:ocl_dft_new_concept  
						
						
						
						
					 
					
						2014-07-28 15:59:59 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Karsakov 
							
						 
					 
					
						
						
							
						
						37d01e2d27 
					 
					
						
						
							
							Added license header, using cv::Ptr, small fixes.  
						
						
						
						
					 
					
						2014-07-25 13:27:00 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Karsakov 
							
						 
					 
					
						
						
							
						
						0318d27720 
					 
					
						
						
							
							Enabled precalculated wave  
						
						
						
						
					 
					
						2014-07-22 18:26:58 +04:00 
						 
				 
			
				
					
						
							
							
								PhilLab 
							
						 
					 
					
						
						
							
						
						e82241cba5 
					 
					
						
						
							
							Function for drawing arrows  
						
						... 
						
						
						
						Porting the [PR 2970](https://github.com/Itseez/opencv/pull/2970 ) To the new InputOutputArray type 
						
						
					 
					
						2014-07-18 10:04:44 +02:00 
						 
				 
			
				
					
						
							
							
								Zhigang Gong 
							
						 
					 
					
						
						
							
						
						2e49ca4903 
					 
					
						
						
							
							Avoid unmap an umat(ocl) which hasn't been mapped at all.  
						
						... 
						
						
						
						According to opencl 1.2 spec 5.4.2:
  enqueues a command to unmap a previously mapped region of a memory object.
  ...
  CL_INVALID_VALUE if mapped_ptr is not a valid pointer returned by
  clEnqueueMapBuffer, or clEnqueueMapImage for memobj.
So if the u->data is not from a clEnqueueMapBuffer call, we should not
call clEnqueueUnmapMemObject() unmap it. With this patch, the cases
./opencv_test_video --gtest_filter=OCL_Video/FarnebackOpticalFlow.Mat/*
could work well with beignet 0.9.1, Otherwise, it will get a
CL_INVALID_VALUE at the clEnqueueUnmapMemObject().
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com > 
						
						
					 
					
						2014-07-09 16:21:20 +08:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						e8850bf84a 
					 
					
						
						
							
							Merge pull request  #2626  from KayKwon:matlab_formatter  
						
						
						
						
					 
					
						2014-06-26 17:40:26 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						d9daa0cbaa 
					 
					
						
						
							
							ocl: added runtime flags for debugging  
						
						
						
						
					 
					
						2014-06-19 17:52:46 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						17956a5ae5 
					 
					
						
						
							
							optimized cv::normalize in case of mask  
						
						
						
						
					 
					
						2014-06-02 15:33:19 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						3d7a457c97 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	doc/tutorials/introduction/linux_install/linux_install.rst
	modules/core/doc/operations_on_arrays.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/gpu/src/cuda/resize.cu
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/video/src/bgfg_gaussmix2.cpp 
						
						
					 
					
						2014-05-19 18:39:20 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						934cb6c452 
					 
					
						
						
							
							Merge pull request  #2680  from adrians:remove_cv_err  
						
						
						
						
					 
					
						2014-05-19 17:35:03 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						2756ae2051 
					 
					
						
						
							
							exposed OpenCL-control functions to python  
						
						
						
						
					 
					
						2014-05-14 17:42:21 +04:00 
						 
				 
			
				
					
						
							
							
								StevenPuttemans 
							
						 
					 
					
						
						
							
						
						006956c324 
					 
					
						
						
							
							Fixing as suggested in bug 2626, made naming same for both C, C++ and python API  
						
						
						
						
					 
					
						2014-05-13 11:02:01 +02:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						19a2495067 
					 
					
						
						
							
							fixed IPP related warnings  
						
						
						
						
					 
					
						2014-05-08 13:31:27 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						07d5f56707 
					 
					
						
						
							
							Merge pull request  #2679  from alalek:ippicv_update  
						
						
						
						
					 
					
						2014-05-07 18:24:41 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						d54aa307fd 
					 
					
						
						
							
							Merge pull request  #2676  from ilya-lavrenov:ipp_gaussianblur  
						
						
						
						
					 
					
						2014-05-07 16:49:59 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						5658ba0002 
					 
					
						
						
							
							icv: update package  
						
						
						
						
					 
					
						2014-04-29 15:35:27 +04:00 
						 
				 
			
				
					
						
							
							
								Adrian Stratulat 
							
						 
					 
					
						
						
							
						
						cbf3c1fbf1 
					 
					
						
						
							
							remove unused macros  
						
						
						
						
					 
					
						2014-04-28 19:40:11 +00:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						55bbca2d09 
					 
					
						
						
							
							added more types to cv::GaussianBlur  
						
						
						
						
					 
					
						2014-04-28 13:50:28 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						7ee1d5f69b 
					 
					
						
						
							
							ipp: added LUT optimization  
						
						
						
						
					 
					
						2014-04-25 12:09:06 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						05a47d9014 
					 
					
						
						
							
							cmd option  
						
						
						
						
					 
					
						2014-04-17 18:06:14 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						2cd7a913ed 
					 
					
						
						
							
							verbose errors  
						
						
						
						
					 
					
						2014-04-17 11:07:01 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						f3c56f8310 
					 
					
						
						
							
							first attemp  
						
						
						
						
					 
					
						2014-04-17 11:07:01 +04:00 
						 
				 
			
				
					
						
							
							
								KayKwon 
							
						 
					 
					
						
						
							
						
						e13e3be16e 
					 
					
						
						
							
							Merge branch 'master' into matlab_formatter  
						
						
						
						
					 
					
						2014-04-16 11:13:02 +09:00 
						 
				 
			
				
					
						
							
							
								KayKwon 
							
						 
					 
					
						
						
							
						
						84257b57d0 
					 
					
						
						
							
							Fix for (Bug  #2789 )  
						
						... 
						
						
						
						Add MatlabFormatter for matlab style output.
See http://code.opencv.org/issues/2789  
						
						
					 
					
						2014-04-16 10:56:27 +09:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						80ef1f6753 
					 
					
						
						
							
							Merge pull request  #2621  from arkunze:pullreq/140319-resize-b  
						
						
						
						
					 
					
						2014-04-15 19:56:56 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						dab8e920b0 
					 
					
						
						
							
							Merge pull request  #2565  from apavlenko:tapi_stitching  
						
						
						
						
					 
					
						2014-04-15 19:56:11 +04:00 
						 
				 
			
				
					
						
							
							
								Aaron Kunze 
							
						 
					 
					
						
						
							
						
						ebbac3c66d 
					 
					
						
						
							
							Optimizes OpenCL resize and optical flow to use image extension.  
						
						
						
						
					 
					
						2014-04-14 16:09:17 -07:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						ad7f2311c0 
					 
					
						
						
							
							cv::Laplacian  
						
						
						
						
					 
					
						2014-04-14 14:34:28 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						19d470749b 
					 
					
						
						
							
							added macro for denoting region for suppression of "Wdeprecated-declarations"  
						
						
						
						
					 
					
						2014-04-11 13:45:20 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						925178749a 
					 
					
						
						
							
							removing SuppressWarning and CV_OPENCL_RUN  
						
						
						
						
					 
					
						2014-04-11 13:09:19 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						06738468af 
					 
					
						
						
							
							TAPI: stiching: add custom OpenCL kernels for MultiBandBlender  
						
						
						
						
					 
					
						2014-04-11 13:01:12 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						1d9808e5d5 
					 
					
						
						
							
							TAPI: stitching, replaced Mat->UMat/_Array  
						
						
						
						
					 
					
						2014-04-11 13:01:06 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						1461ab41bc 
					 
					
						
						
							
							ipp: added support for updated ICV package  
						
						
						
						
					 
					
						2014-04-09 18:20:49 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						444ab0ef0d 
					 
					
						
						
							
							fixed (IppiSize&)sz  
						
						
						
						
					 
					
						2014-04-09 00:19:56 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						a6ef45aa13 
					 
					
						
						
							
							Merge pull request  #2582  from vbystricky:ipp_fix  
						
						
						
						
					 
					
						2014-04-08 14:30:48 +04:00 
						 
				 
			
				
					
						
							
							
								vbystricky 
							
						 
					 
					
						
						
							
						
						f23134ce01 
					 
					
						
						
							
							Add IPP_VERSION_X100 define  
						
						
						
						
					 
					
						2014-04-08 12:43:57 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						9ec823d800 
					 
					
						
						
							
							Merge pull request  #2538  from ElenaGvozdeva:ipp_async_convert  
						
						
						
						
					 
					
						2014-04-08 11:05:30 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						bfc546d23c 
					 
					
						
						
							
							enable IPP ICV support  
						
						
						
						
					 
					
						2014-04-03 15:05:38 +04:00 
						 
				 
			
				
					
						
							
							
								Elena Gvozdeva 
							
						 
					 
					
						
						
							
						
						037ac27ec8 
					 
					
						
						
							
							Added SharedMatrix  
						
						
						
						
					 
					
						2014-04-03 14:53:27 +04:00 
						 
				 
			
				
					
						
							
							
								Elena Gvozdeva 
							
						 
					 
					
						
						
							
						
						fa2d79a15b 
					 
					
						
						
							
							Added IPP Async converters, doc and sample  
						
						
						
						
					 
					
						2014-04-01 16:47:29 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						e23f7303a6 
					 
					
						
						
							
							OpenCV version++. OpenCV Manager version++.  
						
						
						
						
					 
					
						2014-03-31 15:00:25 -07:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						2875ce60ea 
					 
					
						
						
							
							added 3-channels support to optimized version  
						
						
						
						
					 
					
						2014-03-21 16:02:47 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						82e6edfba2 
					 
					
						
						
							
							optimized sep filter  
						
						
						
						
					 
					
						2014-03-18 00:16:38 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						9cafd50160 
					 
					
						
						
							
							ocl: fixes  
						
						
						
						
					 
					
						2014-03-14 19:51:19 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						755ca4b7cf 
					 
					
						
						
							
							ocl: compare with scalar  
						
						
						
						
					 
					
						2014-03-14 19:51:19 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						0764a23eb2 
					 
					
						
						
							
							Merge pull request  #2459  from ilya-lavrenov:tapi_experiments  
						
						
						
						
					 
					
						2014-03-13 16:49:57 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						2755ae5df9 
					 
					
						
						
							
							experiments  
						
						
						
						
					 
					
						2014-03-11 23:03:55 +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 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						182d74d33f 
					 
					
						
						
							
							Merge pull request  #2441  from akarsakov:ocl_platform_vendor  
						
						
						
						
					 
					
						2014-03-07 13:54:13 +04:00