From fc1f9ab236a93261293a05f525ce3903019e10eb Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 26 Dec 2013 17:13:26 +0400 Subject: [PATCH 1/2] removed unnecessary data copying --- modules/core/src/matmul.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/matmul.cpp b/modules/core/src/matmul.cpp index 16eb6e087..dc90ac447 100644 --- a/modules/core/src/matmul.cpp +++ b/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)); From 5b3520fa466334649c9e174c98c06e23caf204e0 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 26 Dec 2013 17:14:20 +0400 Subject: [PATCH 2/2] fixed warning [ -Wreorder ] --- modules/ocl/src/fft.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocl/src/fft.cpp b/modules/ocl/src/fft.cpp index 395f14fba..2cfffef5f 100644 --- a/modules/ocl/src/fft.cpp +++ b/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();