Merge pull request #2066 from ilya-lavrenov:tapi_ocl

modules/core/src/matmul.cpp

@@ -724,7 +724,7 @@ static bool ocl_gemm( InputArray matA, InputArray matB, double alpha,
 
     UMat A = matA.getUMat(), B = matB.getUMat(), D = matD.getUMat();
     if (haveC)
-        ctrans ? transpose(matC, D) : matC.getMat().copyTo(D); // TODO fix it as soon as .copyTo works as expected
+        ctrans ? transpose(matC, D) : matC.copyTo(D);
     else
         D.setTo(Scalar::all(0));
 

modules/ocl/src/fft.cpp

@@ -169,7 +169,7 @@ void cv::ocl::fft_teardown()
 
 // bake a new plan
 cv::ocl::FftPlan::FftPlan(Size _dft_size, int _src_step, int _dst_step, int _depth, int _flags, FftType _type)
-    : plHandle(0), dft_size(_dft_size), src_step(_src_step), depth(_depth), dst_step(_dst_step), flags(_flags), type(_type)
+    : plHandle(0), dft_size(_dft_size), src_step(_src_step), dst_step(_dst_step), depth(_depth), flags(_flags), type(_type)
 {
     fft_setup();