Merge pull request #438 from bitwangyaoyao:2.4_fixwarings
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 6 Feb 2013 10:04:27 +0000 (14:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 6 Feb 2013 10:04:28 +0000 (14:04 +0400)
1  2 
modules/ocl/src/pyrlk.cpp

@@@ -703,7 -703,7 +703,7 @@@ static cl_mem bindTexture(const oclMat 
      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;
@@@ -742,7 -742,7 +742,7 @@@ static void lkSparse_run(oclMat &I, ocl
      Context  *clCxt = I.clCxt;
      char platform[256] = {0};
      cl_platform_id pid;
 -    clGetDeviceInfo(*clCxt->impl->devices, CL_DEVICE_PLATFORM, sizeof(pid), &pid, NULL);
 +    clGetDeviceInfo(clCxt->impl->devices, CL_DEVICE_PLATFORM, sizeof(pid), &pid, NULL);
      clGetPlatformInfo(pid, CL_PLATFORM_NAME, 256, platform, NULL);
      std::string namestr = platform;
      bool isImageSupported = true;