Merge pull request #963 from bitwangyaoyao:master_oclMat

This commit is contained in:
Vadim Pisarevsky
2013-06-07 13:43:50 +04:00
committed by OpenCV Buildbot
3 changed files with 17 additions and 13 deletions

View File

@@ -65,9 +65,9 @@ namespace cv
clMemcpyDeviceToDevice
};
///////////////////////////OpenCL call wrappers////////////////////////////
//void CV_EXPORTS openCLMallocPitch(Context *clCxt, void **dev_ptr, size_t *pitch,
// size_t widthInBytes, size_t height);
void CV_EXPORTS openCLMallocPitch(Context *clCxt, void **dev_ptr, size_t *pitch,
size_t widthInBytes, size_t height);
void CV_EXPORTS openCLMallocPitchEx(Context *clCxt, void **dev_ptr, size_t *pitch,
size_t widthInBytes, size_t height,
DevMemRW rw_type, DevMemType mem_type, void* hptr = 0);
void CV_EXPORTS openCLMemcpy2D(Context *clCxt, void *dst, size_t dpitch,