1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

build: detect Android via '__ANDROID__' macro

https://sourceforge.net/p/predef/wiki/OperatingSystems
This commit is contained in:
Alexander Alekhin
2017-07-10 12:43:59 +03:00
parent cddf868572
commit a4a47b538c
25 changed files with 73 additions and 73 deletions
+3 -3
View File
@@ -2187,7 +2187,7 @@ static bool ocl_minMaxIdx( InputArray _src, double* minVal, double* maxVal, int*
{
const ocl::Device & dev = ocl::Device::getDefault();
#ifdef ANDROID
#ifdef __ANDROID__
if (dev.isNVidia())
return false;
#endif
@@ -2975,7 +2975,7 @@ static bool ocl_norm( InputArray _src, int normType, InputArray _mask, double &
{
const ocl::Device & d = ocl::Device::getDefault();
#ifdef ANDROID
#ifdef __ANDROID__
if (d.isNVidia())
return false;
#endif
@@ -3317,7 +3317,7 @@ namespace cv {
static bool ocl_norm( InputArray _src1, InputArray _src2, int normType, InputArray _mask, double & result )
{
#ifdef ANDROID
#ifdef __ANDROID__
if (ocl::Device::getDefault().isNVidia())
return false;
#endif