Merge pull request #438 from bitwangyaoyao:2.4_fixwarings

This commit is contained in:
Andrey Kamaev 2013-02-06 14:04:27 +04:00 committed by OpenCV Buildbot
commit 7cdede0c55
2 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
Data Structures
=============================
.. ocv:class:: oclMat
.. ocv:class:: ocl::oclMat
OpenCV C++ 1-D or 2-D dense array class ::

View File

@ -703,7 +703,7 @@ static cl_mem bindTexture(const oclMat &mat, int depth, int channels)
desc.image_type = CL_MEM_OBJECT_IMAGE2D;
desc.image_width = mat.step / mat.elemSize();
desc.image_height = mat.rows;
desc.image_depth = NULL;
desc.image_depth = 0;
desc.image_array_size = 1;
desc.image_row_pitch = 0;
desc.image_slice_pitch = 0;