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

Merge pull request #582 from bitwangyaoyao:2.4_fixBlend

Browse Source
This commit is contained in:
Andrey Kamaev 2013-02-28 15:43:50 +04:00 committed by OpenCV Buildbot
commit d0e340bc80
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ void cv::ocl::blendLinear(const oclMat &img1, const oclMat &img2, const oclMat &
size_t localSize[] = {256, 1, 1}; size_t localSize[] = {256, 1, 1};
vector< pair<size_t, const void *> > args; vector< pair<size_t, const void *> > args;
result.create(img1.size(), CV_MAKE_TYPE(depth,img1.channels()));
if(globalSize[0] != 0) if(globalSize[0] != 0)
{ {
args.push_back( make_pair( sizeof(cl_mem), (void *)&result.data )); args.push_back( make_pair( sizeof(cl_mem), (void *)&result.data ));