potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #9130 from alalek:android_define

Browse Source
This commit is contained in:
Alexander Alekhin
2017-07-14 17:17:24 +00:00
parent e5fbb4f5d2 a4a47b538c
commit 5a54acef4e
25 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/stat.cpp
+3 -3
View File
@@ -2177,7 +2177,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
@@ -2971,7 +2971,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
@@ -3313,7 +3313,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