generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2066 from ilya-lavrenov:tapi_ocl

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-12-26 19:38:01 +04:00
committed by OpenCV Buildbot
parent a981295524 5b3520fa46
commit fd6a74496b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/matmul.cpp
View File

@@ -724,7 +724,7 @@ static bool ocl_gemm( InputArray matA, InputArray matB, double alpha,
UMat A = matA.getUMat(), B = matB.getUMat(), D = matD.getUMat(); UMat A = matA.getUMat(), B = matB.getUMat(), D = matD.getUMat();
if (haveC) 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 else
D.setTo(Scalar::all(0)); D.setTo(Scalar::all(0));

2
modules/ocl/src/fft.cpp
View File

@@ -169,7 +169,7 @@ void cv::ocl::fft_teardown()
// bake a new plan // bake a new plan
cv::ocl::FftPlan::FftPlan(Size _dft_size, int _src_step, int _dst_step, int _depth, int _flags, FftType _type) 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(); fft_setup();