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
..
opencv2	Merge pull request #12637 from savuor:fix/instr_ipp_ocl	2018-09-27 22:39:06 +03:00