Rostislav Vasilikhin be989b3b60 Merge pull request #12637 from savuor:fix/instr_ipp_ocl ... Fixes for instrumentation of IPP and OCL (#12637) * fixed warning about re-declaring variable when both IPP and instrumentation are enabled * fixed segfault when no funName provided * compilation fixed when both OCL and instrumentation are enabled		2018-09-27 22:39:06 +03:00
..
3rdparty/SoftFloat	Add install component for 3rdparty libraries licenses	2018-03-06 16:32:30 +03:00
doc	documentation: avoid links to 'master' branch from 3.4 maintenance branch	2018-05-31 16:45:18 +03:00
include/opencv2	Merge pull request #12637 from savuor:fix/instr_ipp_ocl	2018-09-27 22:39:06 +03:00
misc/java	java: change MatOfRotatedRect to CV_32FC5	2018-08-24 14:20:36 +02:00
perf	Utilize CV_UNUSED macro	2018-09-07 20:33:52 +09:00
src	Merge pull request #12637 from savuor:fix/instr_ipp_ocl	2018-09-27 22:39:06 +03:00
test	fix build warnings	2018-09-27 16:31:31 +03:00
CMakeLists.txt	CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement	2018-09-03 18:41:48 +00:00