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

still trying to fix failure in opencv_test_imgproc

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-12-02 13:46:54 +04:00
parent 7626a8e8de
commit 5fea17ff0d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/ocl.cpp
View File

@ -2268,8 +2268,8 @@ bool Kernel::run(int dims, size_t _globalsize[], size_t _localsize[],
CV_Assert(_globalsize != 0); CV_Assert(_globalsize != 0);
for (int i = 0; i < dims; i++) for (int i = 0; i < dims; i++)
{ {
size_t val = _localsize ? _localsize[i] : size_t val = _localsize ? _localsize[i] : 1;
dims == 1 ? 64 : dims == 2 ? (16>>i) : dims == 3 ? (8>>(int)(i>0)) : 1; //dims == 1 ? 64 : dims == 2 ? (16>>i) : dims == 3 ? (8>>(int)(i>0)) : 1;
CV_Assert( val > 0 ); CV_Assert( val > 0 );
total *= _globalsize[i]; total *= _globalsize[i];
globalsize[i] = ((_globalsize[i] + val - 1)/val)*val; globalsize[i] = ((_globalsize[i] + val - 1)/val)*val;

4
modules/core/src/umatrix.cpp
View File

@ -286,8 +286,8 @@ void UMat::copySize(const UMat& m)
UMat::~UMat() UMat::~UMat()
{ {
if( u && u->refcount > 0 ) //if( u && u->refcount > 0 )
u->currAllocator->sync(u); // u->currAllocator->sync(u);
release(); release();
if( step.p != step.buf ) if( step.p != step.buf )
fastFree(step.p); fastFree(step.p);