Skip to content

O
opencv
Commit 7cdede0c authored by Andrey Kamaev's avatar Andrey Kamaev Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #438 from bitwangyaoyao:2.4_fixwarings

parents fe0516c8 568b9352
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/ocl/doc/data_structures.rst
View file @ 7cdede0c
Data Structures Data Structures
============================= =============================
.. ocv:class:: oclMat .. ocv:class:: ocl::oclMat
OpenCV C++ 1-D or 2-D dense array class :: OpenCV C++ 1-D or 2-D dense array class ::
......
modules/ocl/src/pyrlk.cpp
View file @ 7cdede0c
...@@ -703,7 +703,7 @@ static cl_mem bindTexture(const oclMat &mat, int depth, int channels) ...@@ -703,7 +703,7 @@ static cl_mem bindTexture(const oclMat &mat, int depth, int channels)
desc.image_type = CL_MEM_OBJECT_IMAGE2D; desc.image_type = CL_MEM_OBJECT_IMAGE2D;
desc.image_width = mat.step / mat.elemSize(); desc.image_width = mat.step / mat.elemSize();
desc.image_height = mat.rows; desc.image_height = mat.rows;
desc.image_depth = NULL; desc.image_depth = 0;
desc.image_array_size = 1; desc.image_array_size = 1;
desc.image_row_pitch = 0; desc.image_row_pitch = 0;
desc.image_slice_pitch = 0; desc.image_slice_pitch = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment