From 568b93524623252d9f3c0640c45279dae531c5ed Mon Sep 17 00:00:00 2001 From: yao Date: Tue, 5 Feb 2013 17:16:40 +0800 Subject: [PATCH] remove a warning on Linux fix a error in doc --- modules/ocl/doc/data_structures.rst | 2 +- modules/ocl/src/pyrlk.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ocl/doc/data_structures.rst b/modules/ocl/doc/data_structures.rst index a9c2490..8519c40 100644 --- a/modules/ocl/doc/data_structures.rst +++ b/modules/ocl/doc/data_structures.rst @@ -1,7 +1,7 @@ Data Structures ============================= -.. ocv:class:: oclMat +.. ocv:class:: ocl::oclMat OpenCV C++ 1-D or 2-D dense array class :: diff --git a/modules/ocl/src/pyrlk.cpp b/modules/ocl/src/pyrlk.cpp index 0e87106..7eacf2a 100644 --- a/modules/ocl/src/pyrlk.cpp +++ b/modules/ocl/src/pyrlk.cpp @@ -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; -- 2.7.4