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

fix OpenCV code (bug 4006: #4862)

Browse Source
This commit is contained in:
Alexander Alekhin 2015-07-24 19:10:31 +03:00
parent ed7907e46c
commit b36f565d13
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4320,6 +4320,7 @@ public:
u->flags = flags0; u->flags = flags0;
u->allocatorFlags_ = allocatorFlags; u->allocatorFlags_ = allocatorFlags;
CV_DbgAssert(!u->tempUMat()); // for bufferPool.release() consistency in deallocate() CV_DbgAssert(!u->tempUMat()); // for bufferPool.release() consistency in deallocate()
u->markHostCopyObsolete(true);
return u; return u;
} }
@ -4460,6 +4461,7 @@ public:
CV_Assert(u->handle != 0 && u->urefcount == 0); CV_Assert(u->handle != 0 && u->urefcount == 0);
if(u->tempUMat()) if(u->tempUMat())
{ {
CV_Assert(u->origdata);
// UMatDataAutoLock lock(u); // UMatDataAutoLock lock(u);
if( u->hostCopyObsolete() && u->refcount > 0 ) if( u->hostCopyObsolete() && u->refcount > 0 )
@ -4514,14 +4516,7 @@ public:
} }
else else
{ {
// TODO Is it really needed for clCreateBuffer with CL_MEM_USE_HOST_PTR? // nothing with CL_MEM_USE_HOST_PTR
cl_int retval = 0;
void* data = clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE,
(CL_MAP_READ | CL_MAP_WRITE),
0, u->size, 0, 0, 0, &retval);
CV_OclDbgAssert(retval == CL_SUCCESS);
CV_OclDbgAssert(clEnqueueUnmapMemObject(q, (cl_mem)u->handle, data, 0, 0, 0) == CL_SUCCESS);
CV_OclDbgAssert(clFinish(q) == CL_SUCCESS);
} }
} }
u->markHostCopyObsolete(false); u->markHostCopyObsolete(false);
@ -4545,20 +4540,27 @@ public:
clReleaseMemObject((cl_mem)u->handle); clReleaseMemObject((cl_mem)u->handle);
} }
u->handle = 0; u->handle = 0;
u->markDeviceCopyObsolete(true);
u->currAllocator = u->prevAllocator; u->currAllocator = u->prevAllocator;
if(u->data && u->copyOnMap() && !(u->flags & UMatData::USER_ALLOCATED)) u->prevAllocator = NULL;
if(u->data && u->copyOnMap() && u->data != u->origdata)
fastFree(u->data); fastFree(u->data);
u->data = u->origdata; u->data = u->origdata;
if(u->refcount == 0) if(u->refcount == 0)
{
u->currAllocator->deallocate(u); u->currAllocator->deallocate(u);
u = NULL;
}
} }
else else
{ {
CV_Assert(u->origdata == NULL);
CV_Assert(u->refcount == 0); CV_Assert(u->refcount == 0);
if(u->data && u->copyOnMap() && !(u->flags & UMatData::USER_ALLOCATED)) if(u->data && u->copyOnMap() && u->data != u->origdata)
{ {
fastFree(u->data); fastFree(u->data);
u->data = 0; u->data = 0;
u->markHostCopyObsolete(true);
} }
if (u->allocatorFlags_ & ALLOCATOR_FLAGS_BUFFER_POOL_USED) if (u->allocatorFlags_ & ALLOCATOR_FLAGS_BUFFER_POOL_USED)
{ {
@ -4598,8 +4600,11 @@ public:
clReleaseMemObject((cl_mem)u->handle); clReleaseMemObject((cl_mem)u->handle);
} }
u->handle = 0; u->handle = 0;
u->markDeviceCopyObsolete(true);
delete u; delete u;
u = NULL;
} }
CV_Assert(u == NULL || u->refcount);
} }
void map(UMatData* u, int accessFlags) const void map(UMatData* u, int accessFlags) const
@ -4650,9 +4655,9 @@ public:
return; return;
} }
#endif #endif
if (u->data) // FIXIT Workaround for UMat synchronization issue if (!u->hostCopyObsolete()) // FIXIT Workaround for UMat synchronization issue
{ {
//CV_Assert(u->hostCopyObsolete() == false); CV_Assert(u->data);
return; return;
} }
@ -4732,7 +4737,7 @@ public:
} }
u->data = 0; u->data = 0;
u->markDeviceCopyObsolete(false); u->markDeviceCopyObsolete(false);
u->markHostCopyObsolete(false); u->markHostCopyObsolete(true);
return; return;
} }
#endif #endif
@ -4755,7 +4760,7 @@ public:
u->size, alignedPtr.getAlignedPtr(), 0, 0, 0)) == CL_SUCCESS ); u->size, alignedPtr.getAlignedPtr(), 0, 0, 0)) == CL_SUCCESS );
} }
u->markDeviceCopyObsolete(false); u->markDeviceCopyObsolete(false);
u->markHostCopyObsolete(false); u->markHostCopyObsolete(true);
} }
bool checkContinuous(int dims, const size_t sz[], bool checkContinuous(int dims, const size_t sz[],

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

@ -221,6 +221,7 @@ UMat Mat::getUMat(int accessFlags, UMatUsageFlags usageFlags) const
UMat hdr; UMat hdr;
if(!data) if(!data)
return hdr; return hdr;
accessFlags |= ACCESS_RW;
UMatData* temp_u = u; UMatData* temp_u = u;
if(!temp_u) if(!temp_u)
{ {
@ -228,7 +229,6 @@ UMat Mat::getUMat(int accessFlags, UMatUsageFlags usageFlags) const
if(!a) if(!a)
a = a0; a = a0;
temp_u = a->allocate(dims, size.p, type(), data, step.p, accessFlags, usageFlags); temp_u = a->allocate(dims, size.p, type(), data, step.p, accessFlags, usageFlags);
temp_u->refcount = 1;
} }
UMat::getStdAllocator()->allocate(temp_u, accessFlags, usageFlags); // TODO result is not checked UMat::getStdAllocator()->allocate(temp_u, accessFlags, usageFlags); // TODO result is not checked
hdr.flags = flags; hdr.flags = flags;
@ -584,7 +584,9 @@ Mat UMat::getMat(int accessFlags) const
{ {
if(!u) if(!u)
return Mat(); return Mat();
u->currAllocator->map(u, accessFlags | ACCESS_READ); // TODO Support ACCESS_WRITE without unnecessary data transfers // TODO Support ACCESS_READ (ACCESS_WRITE) without unnecessary data transfers
accessFlags |= ACCESS_RW;
u->currAllocator->map(u, accessFlags);
CV_Assert(u->data != 0); CV_Assert(u->data != 0);
Mat hdr(dims, size.p, type(), u->data + offset, step.p); Mat hdr(dims, size.p, type(), u->data + offset, step.p);
hdr.flags = flags; hdr.flags = flags;

2
modules/core/test/test_umat.cpp
View File

@ -572,7 +572,7 @@ TEST_P(getUMat, custom_ptr)
EXPECT_EQ(0, norm); EXPECT_EQ(0, norm);
delete[] pData; delete[] (unsigned char*)pData;
} }
TEST_P(getUMat, self_allocated) TEST_P(getUMat, self_allocated)