Merge pull request #1780 from ilya-lavrenov:ocl_m_pi

e4dee5b3 · Roman Donchenko · OpenCV Buildbot · 0ac61240 · 5beb8872 · e4dee5b3
隐藏空白更改
内联并排

Showing with 14 addition and 10 deletion

modules/ocl/src/opencl/arithm_phase.cl modules/ocl/src/opencl/arithm_phase.cl +7 -7

modules/ocl/src/opencl/arithm_polarToCart.cl modules/ocl/src/opencl/arithm_polarToCart.cl +7 -3

未找到文件。
--- 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**************************************/

--- 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

 /////////////////////////////////////////////////////////////////////////////////////////////////////