From 5beb88724709d4ac81abe37323187c752024b36c Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 11 Nov 2013 00:53:26 +0400 Subject: [PATCH] replaced custom PI by OpenCL M_PI constant --- modules/ocl/src/opencl/arithm_phase.cl | 14 +++++++------- modules/ocl/src/opencl/arithm_polarToCart.cl | 10 +++++++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/ocl/src/opencl/arithm_phase.cl b/modules/ocl/src/opencl/arithm_phase.cl index f9835948c4..978fd3b97f 100644 --- a/modules/ocl/src/opencl/arithm_phase.cl +++ b/modules/ocl/src/opencl/arithm_phase.cl @@ -45,16 +45,16 @@ // #if defined (DOUBLE_SUPPORT) - #ifdef cl_khr_fp64 - #pragma OPENCL EXTENSION cl_khr_fp64:enable - #elif defined (cl_amd_fp64) + #ifdef cl_amd_fp64 #pragma OPENCL EXTENSION cl_amd_fp64:enable + #elif defined (cl_khr_fp64) + #pragma OPENCL EXTENSION cl_khr_fp64:enable #endif - #define CV_PI 3.1415926535897932384626433832795 - #define CV_2PI 2*CV_PI + #define CV_PI M_PI + #define CV_2PI (2 * CV_PI) #else - #define CV_PI 3.1415926535897932384626433832795f - #define CV_2PI 2*CV_PI + #define CV_PI M_PI_F + #define CV_2PI (2 * CV_PI) #endif /**************************************phase inradians**************************************/ diff --git a/modules/ocl/src/opencl/arithm_polarToCart.cl b/modules/ocl/src/opencl/arithm_polarToCart.cl index 8469cdb097..9e2e860e7f 100644 --- a/modules/ocl/src/opencl/arithm_polarToCart.cl +++ b/modules/ocl/src/opencl/arithm_polarToCart.cl @@ -44,10 +44,14 @@ //M*/ #ifdef DOUBLE_SUPPORT - #pragma OPENCL EXTENSION cl_khr_fp64:enable - #define CV_PI 3.1415926535897932384626433832795 + #ifdef cl_amd_fp64 + #pragma OPENCL EXTENSION cl_amd_fp64:enable + #elif defined (cl_khr_fp64) + #pragma OPENCL EXTENSION cl_khr_fp64:enable + #endif + #define CV_PI M_PI #else - #define CV_PI 3.1415926535897932384626433832795f + #define CV_PI M_PI_F #endif /////////////////////////////////////////////////////////////////////////////////////////////////////