From eb01bef20f304099c12d5e87fa490c4f675872f9 Mon Sep 17 00:00:00 2001 From: dirk Date: Sun, 18 Sep 2016 12:19:09 +0200 Subject: [PATCH] Typecast fixes. --- MagickCore/accelerate.c | 10 +++++----- MagickCore/opencl-private.h | 2 +- MagickCore/opencl.c | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c index 23c7d8f81..32fce29a0 100644 --- a/MagickCore/accelerate.c +++ b/MagickCore/accelerate.c @@ -289,7 +289,7 @@ static cl_mem createKernelInfo(MagickCLDevice device,const double radius, kernelBufferPtr[i] = (float)kernel->values[i]; imageKernelBuffer=CreateOpenCLBuffer(device,CL_MEM_COPY_HOST_PTR | CL_MEM_READ_ONLY,kernel->width*sizeof(*kernelBufferPtr),kernelBufferPtr); - *width=kernel->width; + *width=(cl_uint) kernel->width; kernelBufferPtr=(float *) RelinquishMagickMemory(kernelBufferPtr); kernel=DestroyKernelInfo(kernel); if (imageKernelBuffer == (cl_mem) NULL) @@ -479,13 +479,13 @@ static Image *ComputeAddNoiseImage(const Image *image,MagickCLEnv clEnv, break; }; if (GetPixelRedTraits(image) != UndefinedPixelTrait) - numRandomNumberPerPixel+=numRandPerChannel; + numRandomNumberPerPixel+=(cl_uint) numRandPerChannel; if (GetPixelGreenTraits(image) != UndefinedPixelTrait) - numRandomNumberPerPixel+=numRandPerChannel; + numRandomNumberPerPixel+=(cl_uint) numRandPerChannel; if (GetPixelBlueTraits(image) != UndefinedPixelTrait) - numRandomNumberPerPixel+=numRandPerChannel; + numRandomNumberPerPixel+=(cl_uint) numRandPerChannel; if (GetPixelAlphaTraits(image) != UndefinedPixelTrait) - numRandomNumberPerPixel+=numRandPerChannel; + numRandomNumberPerPixel+=(cl_uint) numRandPerChannel; addNoiseKernel=AcquireOpenCLKernel(device,"AddNoise"); if (addNoiseKernel == (cl_kernel) NULL) diff --git a/MagickCore/opencl-private.h b/MagickCore/opencl-private.h index 9d789e992..1048a9f62 100644 --- a/MagickCore/opencl-private.h +++ b/MagickCore/opencl-private.h @@ -400,7 +400,7 @@ extern MagickPrivate cl_command_queue AcquireOpenCLCommandQueue(MagickCLDevice); extern MagickPrivate cl_int - SetOpenCLKernelArg(cl_kernel,cl_uint,size_t,const void *); + SetOpenCLKernelArg(cl_kernel,size_t,size_t,const void *); extern MagickPrivate cl_kernel AcquireOpenCLKernel(MagickCLDevice,const char *); diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c index 46c986505..6c03ecd2d 100644 --- a/MagickCore/opencl.c +++ b/MagickCore/opencl.c @@ -459,10 +459,11 @@ MagickPrivate void ReleaseOpenCLMemObject(cl_mem memobj) (void) openCL_library->clReleaseMemObject(memobj); } -MagickPrivate cl_int SetOpenCLKernelArg(cl_kernel kernel,cl_uint arg_index, +MagickPrivate cl_int SetOpenCLKernelArg(cl_kernel kernel,size_t arg_index, size_t arg_size,const void *arg_value) { - return(openCL_library->clSetKernelArg(kernel,arg_index,arg_size,arg_value)); + return(openCL_library->clSetKernelArg(kernel,(cl_uint) arg_index,arg_size, + arg_value)); } /* @@ -2200,7 +2201,7 @@ static void LoadOpenCLDevices(MagickCLEnv clEnv) continue; status=clEnv->library->clGetDeviceIDs(platforms[i],CL_DEVICE_TYPE_CPU | - CL_DEVICE_TYPE_GPU,clEnv->number_devices,devices,&number_devices); + CL_DEVICE_TYPE_GPU,(cl_uint) clEnv->number_devices,devices,&number_devices); if (status != CL_SUCCESS) continue; -- 2.40.0