diff --git a/3rdparty/carotene/src/channel_extract.cpp b/3rdparty/carotene/src/channel_extract.cpp index 109f74f3fe9c..f663bc60058d 100644 --- a/3rdparty/carotene/src/channel_extract.cpp +++ b/3rdparty/carotene/src/channel_extract.cpp @@ -49,7 +49,7 @@ void extract2(const Size2D &size, { internal::assertSupportedConfiguration(); #ifdef CAROTENE_NEON -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw32 = size.width >= 31 ? size.width - 31 : 0; #endif size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; @@ -60,7 +60,7 @@ void extract2(const Size2D &size, u8 * dst = internal::getRowPtr(dstBase, dstStride, i); size_t sj = 0u, dj = 0u; -#ifndef ANDROID +#ifndef __ANDROID__ for (; dj < roiw32; sj += 64, dj += 32) { internal::prefetch(src + sj); @@ -101,7 +101,7 @@ void extract3(const Size2D &size, { internal::assertSupportedConfiguration(); #ifdef CAROTENE_NEON -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw32 = size.width >= 31 ? size.width - 31 : 0; #endif size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; @@ -112,7 +112,7 @@ void extract3(const Size2D &size, u8 * dst = internal::getRowPtr(dstBase, dstStride, i); size_t sj = 0u, dj = 0u; -#ifndef ANDROID +#ifndef __ANDROID__ for (; dj < roiw32; sj += 96, dj += 32) { internal::prefetch(src + sj); @@ -153,7 +153,7 @@ void extract4(const Size2D &size, { internal::assertSupportedConfiguration(); #ifdef CAROTENE_NEON -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw32 = size.width >= 31 ? size.width - 31 : 0; #endif size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; @@ -164,7 +164,7 @@ void extract4(const Size2D &size, u8 * dst = internal::getRowPtr(dstBase, dstStride, i); size_t sj = 0u, dj = 0u; -#ifndef ANDROID +#ifndef __ANDROID__ for (; dj < roiw32; sj += 128, dj += 32) { internal::prefetch(src + sj); diff --git a/3rdparty/carotene/src/channels_combine.cpp b/3rdparty/carotene/src/channels_combine.cpp index 9f0533c86662..157c8b812178 100644 --- a/3rdparty/carotene/src/channels_combine.cpp +++ b/3rdparty/carotene/src/channels_combine.cpp @@ -240,7 +240,7 @@ void combineYUYV(const Size2D &size, { internal::assertSupportedConfiguration(); #ifdef CAROTENE_NEON -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw32 = size.width >= 31 ? size.width - 31 : 0; #endif size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; @@ -253,7 +253,7 @@ void combineYUYV(const Size2D &size, u8 * dst = internal::getRowPtr(dstBase, dstStride, i); size_t syj = 0u, sj = 0u, dj = 0u; -#ifndef ANDROID +#ifndef __ANDROID__ for (; sj < roiw32; sj += 32, syj += 64, dj += 128) { internal::prefetch(srcy + syj); @@ -317,7 +317,7 @@ void combineUYVY(const Size2D &size, { internal::assertSupportedConfiguration(); #ifdef CAROTENE_NEON -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw32 = size.width >= 31 ? size.width - 31 : 0; #endif size_t roiw8 = size.width >= 7 ? size.width - 7 : 0; @@ -330,7 +330,7 @@ void combineUYVY(const Size2D &size, u8 * dst = internal::getRowPtr(dstBase, dstStride, i); size_t syj = 0u, sj = 0u, dj = 0u; -#ifndef ANDROID +#ifndef __ANDROID__ for (; sj < roiw32; sj += 32, syj += 64, dj += 128) { internal::prefetch(srcy + syj); diff --git a/3rdparty/carotene/src/flip.cpp b/3rdparty/carotene/src/flip.cpp index 339398dd9288..3f02351e7d70 100644 --- a/3rdparty/carotene/src/flip.cpp +++ b/3rdparty/carotene/src/flip.cpp @@ -105,12 +105,12 @@ void flip3(const Size2D & size, { using namespace internal; -#ifndef ANDROID +#ifndef __ANDROID__ typedef typename VecTraits::vec128 vec128; #endif typedef typename VecTraits::vec64 vec64; -#ifndef ANDROID +#ifndef __ANDROID__ u32 step_base = 16 / sizeof(T), step_base3 = step_base * 3; size_t roiw_base = size.width >= (step_base - 1) ? size.width - step_base + 1 : 0; #endif @@ -123,7 +123,7 @@ void flip3(const Size2D & size, T * dst = getRowPtr((T *)dstBase, dstStride, (flipMode & FLIP_VERTICAL_MODE) != 0 ? size.height - i - 1 : i); size_t j = 0, js = 0, jd = size.width * 3; -#ifndef ANDROID +#ifndef __ANDROID__ for (; j < roiw_base; j += step_base, js += step_base3, jd -= step_base3) { prefetch(src + js); @@ -139,7 +139,7 @@ void flip3(const Size2D & size, vst3q(dst + jd - step_base3, v_dst); } -#endif // ANDROID +#endif // __ANDROID__ for (; j < roiw_tail; j += step_tail, js += step_tail3, jd -= step_tail3) { diff --git a/3rdparty/carotene/src/resize.cpp b/3rdparty/carotene/src/resize.cpp index 184deb12050d..9aa632f3c4a8 100644 --- a/3rdparty/carotene/src/resize.cpp +++ b/3rdparty/carotene/src/resize.cpp @@ -359,7 +359,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, } else //if ((wr == 4.0f) && (hr == 4.0f)) //the only scale that lasts after isSupported check { -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw16 = dsize.width >= 15 ? dsize.width - 15 : 0; #endif size_t roiw8 = dsize.width >= 7 ? dsize.width - 7 : 0; @@ -373,7 +373,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, u8 * dst_row = internal::getRowPtr(dstBase, dstStride, i); size_t sj = 0, dj = 0; -#ifndef ANDROID +#ifndef __ANDROID__ for ( ; dj < roiw16; dj += 16, sj += 64) { internal::prefetch(src0_row + sj); @@ -450,7 +450,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, { if ((wr == 2.0f) && (hr == 2.0f)) { -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw4 = dsize.width >= 3 ? (dsize.width - 3) << 2 : 0; #endif size_t roiw2 = dsize.width >= 1 ? (dsize.width - 1) << 2 : 0; @@ -462,7 +462,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, u8 * dst_row = internal::getRowPtr(dstBase, dstStride, i); size_t sj = 0, dj = 0; -#ifndef ANDROID +#ifndef __ANDROID__ for ( ; dj < roiw4; dj += 16, sj += 32) { internal::prefetch(src0_row + sj); @@ -537,7 +537,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, } else if ((wr == 0.5f) && (hr == 0.5f)) { -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw32 = dsize.width >= 31 ? (dsize.width - 31) << 2 : 0; #endif size_t roiw16 = dsize.width >= 15 ? (dsize.width - 15) << 2 : 0; @@ -549,7 +549,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, u8 * dst1_row = internal::getRowPtr(dstBase, dstStride, std::min(i + 1, dsize.height - 1)); size_t sj = 0, dj = 0; -#ifndef ANDROID +#ifndef __ANDROID__ for ( ; dj < roiw32; dj += 128, sj += 64) { internal::prefetch(src_row + sj); @@ -758,7 +758,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, { if ((wr == 2.0f) && (wr == 2.0f)) { -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw16 = dsize.width >= 15 ? (dsize.width - 15) * 3 : 0; #endif size_t roiw8 = dsize.width >= 7 ? (dsize.width - 7) * 3 : 0; @@ -770,7 +770,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, u8 * dst_row = internal::getRowPtr(dstBase, dstStride, i); size_t sj = 0, dj = 0; -#ifndef ANDROID +#ifndef __ANDROID__ for ( ; dj < roiw16; dj += 48, sj += 96) { internal::prefetch(src0_row + sj); @@ -856,7 +856,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, } else if ((wr == 0.5f) && (hr == 0.5f)) { -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw32 = dsize.width >= 31 ? (dsize.width - 31) * 3 : 0; #endif size_t roiw16 = dsize.width >= 15 ? (dsize.width - 15) * 3 : 0; @@ -868,7 +868,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, u8 * dst1_row = internal::getRowPtr(dstBase, dstStride, std::min(i + 1, dsize.height - 1)); size_t sj = 0, dj = 0; -#ifndef ANDROID +#ifndef __ANDROID__ for ( ; dj < roiw32; dj += 96, sj += 48) { internal::prefetch(src_row + sj); @@ -928,7 +928,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, } else //if ((hr == 4.0f) && (wr == 4.0f)) //the only scale that lasts after isSupported check { -#ifndef ANDROID +#ifndef __ANDROID__ size_t roiw8 = dsize.width >= 7 ? (dsize.width - 7) * 3 : 0; #endif @@ -941,7 +941,7 @@ inline void resizeAreaRounding(const Size2D &ssize, const Size2D &dsize, u8 * dst_row = internal::getRowPtr(dstBase, dstStride, i); size_t sj = 0, dj = 0; -#ifndef ANDROID +#ifndef __ANDROID__ for ( ; dj < roiw8; dj += 24, sj += 96) { internal::prefetch(src0_row + sj); diff --git a/modules/core/src/opengl.cpp b/modules/core/src/opengl.cpp index f3d106fd248d..8d306f7e6237 100644 --- a/modules/core/src/opengl.cpp +++ b/modules/core/src/opengl.cpp @@ -1590,7 +1590,7 @@ void cv::ogl::render(const ogl::Arrays& arr, InputArray indices, int mode, Scala #endif // HAVE_OPENCL #if defined(HAVE_OPENGL) -# if defined(ANDROID) +# if defined(__ANDROID__) # include # elif defined(__linux__) # include @@ -1659,7 +1659,7 @@ Context& initializeContextFromGL() CL_CONTEXT_PLATFORM, (cl_context_properties)platforms[i], CL_GL_CONTEXT_KHR, (cl_context_properties)wglGetCurrentContext(), CL_WGL_HDC_KHR, (cl_context_properties)wglGetCurrentDC(), -#elif defined(ANDROID) +#elif defined(__ANDROID__) CL_CONTEXT_PLATFORM, (cl_context_properties)platforms[i], CL_GL_CONTEXT_KHR, (cl_context_properties)eglGetCurrentContext(), CL_EGL_DISPLAY_KHR, (cl_context_properties)eglGetCurrentDisplay(), diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp index 71f6b11b9cf1..9f4b27f11343 100644 --- a/modules/core/src/parallel.cpp +++ b/modules/core/src/parallel.cpp @@ -56,7 +56,7 @@ #include #include #include - #if defined ANDROID + #if defined __ANDROID__ #include #elif defined __APPLE__ #include @@ -590,7 +590,7 @@ int cv::getThreadNum(void) #endif } -#ifdef ANDROID +#ifdef __ANDROID__ static inline int getNumberOfCPUsImpl() { FILE* cpuPossible = fopen("/sys/devices/system/cpu/possible", "r"); @@ -641,7 +641,7 @@ int cv::getNumberOfCPUs(void) #endif return (int)sysinfo.dwNumberOfProcessors; -#elif defined ANDROID +#elif defined __ANDROID__ static int ncpus = getNumberOfCPUsImpl(); return ncpus; #elif defined __linux__ diff --git a/modules/core/src/parallel_pthreads.cpp b/modules/core/src/parallel_pthreads.cpp index f4e6d07aa8bb..b571ef08b35b 100644 --- a/modules/core/src/parallel_pthreads.cpp +++ b/modules/core/src/parallel_pthreads.cpp @@ -527,7 +527,7 @@ void ThreadManager::setNumOfThreads(size_t n) size_t ThreadManager::defaultNumberOfThreads() { -#ifdef ANDROID +#ifdef __ANDROID__ // many modern phones/tables have 4-core CPUs. Let's use no more // than 2 threads by default not to overheat the devices const unsigned int default_number_of_threads = 2; diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp index 274c76ab3219..3936daf08b05 100644 --- a/modules/core/src/stat.cpp +++ b/modules/core/src/stat.cpp @@ -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 diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp index 509389443bea..d1dae56c0694 100644 --- a/modules/core/src/system.cpp +++ b/modules/core/src/system.cpp @@ -66,16 +66,16 @@ Mutex* __initialization_mutex_initializer = &getInitializationMutex(); # endif #endif -#if defined ANDROID || defined __linux__ || defined __FreeBSD__ +#if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ # include # include # include -#if defined ANDROID || defined __linux__ +#if defined __ANDROID__ || defined __linux__ # include #endif #endif -#if defined ANDROID && defined HAVE_CPUFEATURES +#if defined __ANDROID__ && defined HAVE_CPUFEATURES # include #endif @@ -206,12 +206,12 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix) #include #include #include -#if defined ANDROID +#if defined __ANDROID__ #include #endif #endif -#ifdef ANDROID +#ifdef __ANDROID__ # include #endif @@ -833,7 +833,7 @@ String tempfile( const char* suffix ) fname = temp_file; #endif # else -# ifdef ANDROID +# ifdef __ANDROID__ //char defaultTemplate[] = "/mnt/sdcard/__opencv_temp.XXXXXX"; char defaultTemplate[] = "/data/local/tmp/__opencv_temp.XXXXXX"; # else diff --git a/modules/core/test/ocl/test_arithm.cpp b/modules/core/test/ocl/test_arithm.cpp index 7425c1796931..9a81760abdb7 100644 --- a/modules/core/test/ocl/test_arithm.cpp +++ b/modules/core/test/ocl/test_arithm.cpp @@ -331,7 +331,7 @@ OCL_TEST_P(Mul, Mat_Scale) OCL_OFF(cv::multiply(src1_roi, src2_roi, dst1_roi, val[0])); OCL_ON(cv::multiply(usrc1_roi, usrc2_roi, udst1_roi, val[0])); -#ifdef ANDROID +#ifdef __ANDROID__ Near(udst1_roi.depth() >= CV_32F ? 2e-1 : 1); #else Near(udst1_roi.depth() >= CV_32F ? 1e-3 : 1); diff --git a/modules/features2d/test/ocl/test_brute_force_matcher.cpp b/modules/features2d/test/ocl/test_brute_force_matcher.cpp index 635953307c13..06ca4bed684a 100644 --- a/modules/features2d/test/ocl/test_brute_force_matcher.cpp +++ b/modules/features2d/test/ocl/test_brute_force_matcher.cpp @@ -111,7 +111,7 @@ PARAM_TEST_CASE(BruteForceMatcher, int, int) } }; -#ifdef ANDROID +#ifdef __ANDROID__ OCL_TEST_P(BruteForceMatcher, DISABLED_Match_Single) #else OCL_TEST_P(BruteForceMatcher, Match_Single) @@ -135,7 +135,7 @@ OCL_TEST_P(BruteForceMatcher, Match_Single) ASSERT_EQ(0, badCount); } -#ifdef ANDROID +#ifdef __ANDROID__ OCL_TEST_P(BruteForceMatcher, DISABLED_KnnMatch_2_Single) #else OCL_TEST_P(BruteForceMatcher, KnnMatch_2_Single) @@ -171,7 +171,7 @@ OCL_TEST_P(BruteForceMatcher, KnnMatch_2_Single) ASSERT_EQ(0, badCount); } -#ifdef ANDROID +#ifdef __ANDROID__ OCL_TEST_P(BruteForceMatcher, DISABLED_RadiusMatch_Single) #else OCL_TEST_P(BruteForceMatcher, RadiusMatch_Single) diff --git a/modules/imgcodecs/test/test_tiff.cpp b/modules/imgcodecs/test/test_tiff.cpp index 4cbb798a63c6..0264da4cd818 100644 --- a/modules/imgcodecs/test/test_tiff.cpp +++ b/modules/imgcodecs/test/test_tiff.cpp @@ -11,7 +11,7 @@ using namespace std::tr1; #define int64 int64_hack_ #include "tiff.h" -#ifdef ANDROID +#ifdef __ANDROID__ // Test disabled as it uses a lot of memory. // It is killed with SIGKILL by out of memory killer. TEST(Imgcodecs_Tiff, DISABLED_decode_tile16384x16384) diff --git a/modules/imgproc/perf/perf_resize.cpp b/modules/imgproc/perf/perf_resize.cpp index 22128801777b..7811193e521b 100644 --- a/modules/imgproc/perf/perf_resize.cpp +++ b/modules/imgproc/perf/perf_resize.cpp @@ -27,7 +27,7 @@ PERF_TEST_P(MatInfo_Size_Size, resizeUpLinear, TEST_CYCLE_MULTIRUN(10) resize(src, dst, to); -#ifdef ANDROID +#ifdef __ANDROID__ SANITY_CHECK(dst, 5); #else SANITY_CHECK(dst, 1 + 1e-6); @@ -54,7 +54,7 @@ PERF_TEST_P(MatInfo_Size_Size, resizeDownLinear, TEST_CYCLE_MULTIRUN(10) resize(src, dst, to); -#ifdef ANDROID +#ifdef __ANDROID__ SANITY_CHECK(dst, 5); #else SANITY_CHECK(dst, 1 + 1e-6); diff --git a/modules/imgproc/perf/perf_warp.cpp b/modules/imgproc/perf/perf_warp.cpp index dda5552d1eeb..f03e64b407fb 100644 --- a/modules/imgproc/perf/perf_warp.cpp +++ b/modules/imgproc/perf/perf_warp.cpp @@ -43,7 +43,7 @@ PERF_TEST_P( TestWarpAffine, WarpAffine, TEST_CYCLE() warpAffine( src, dst, warpMat, sz, interType, borderMode, borderColor ); -#ifdef ANDROID +#ifdef __ANDROID__ SANITY_CHECK(dst, interType==INTER_LINEAR? 5 : 10); #else SANITY_CHECK(dst, 1); @@ -73,7 +73,7 @@ PERF_TEST_P(TestWarpAffine, WarpAffine_ovx, TEST_CYCLE() warpAffine(src, dst, warpMat, sz, interType, borderMode, borderColor); -#ifdef ANDROID +#ifdef __ANDROID__ SANITY_CHECK(dst, interType == INTER_LINEAR ? 5 : 10); #else SANITY_CHECK(dst, 1); @@ -111,7 +111,7 @@ PERF_TEST_P( TestWarpPerspective, WarpPerspective, TEST_CYCLE() warpPerspective( src, dst, warpMat, sz, interType, borderMode, borderColor ); -#ifdef ANDROID +#ifdef __ANDROID__ SANITY_CHECK(dst, interType==INTER_LINEAR? 5 : 10); #else SANITY_CHECK(dst, 1); @@ -149,7 +149,7 @@ PERF_TEST_P(TestWarpPerspective, WarpPerspective_ovx, TEST_CYCLE() warpPerspective(src, dst, warpMat, sz, interType, borderMode, borderColor); -#ifdef ANDROID +#ifdef __ANDROID__ SANITY_CHECK(dst, interType == INTER_LINEAR ? 5 : 10); #else SANITY_CHECK(dst, 1); @@ -195,7 +195,7 @@ PERF_TEST_P( TestWarpPerspectiveNear_t, WarpPerspectiveNear, warpPerspective( src, dst, warpMat, size, interType, borderMode, borderColor ); } -#ifdef ANDROID +#ifdef __ANDROID__ SANITY_CHECK(dst, interType==INTER_LINEAR? 5 : 10); #else SANITY_CHECK(dst, 1); diff --git a/modules/imgproc/src/filter.cpp b/modules/imgproc/src/filter.cpp index a99c456b808e..da14b576d9bc 100644 --- a/modules/imgproc/src/filter.cpp +++ b/modules/imgproc/src/filter.cpp @@ -4171,7 +4171,7 @@ static bool ocl_sepRowFilter2D(const UMat & src, UMat & buf, const Mat & kernelX if (!doubleSupport && (sdepth == CV_64F || ddepth == CV_64F)) return false; -#ifdef ANDROID +#ifdef __ANDROID__ size_t localsize[2] = {16, 10}; #else size_t localsize[2] = {16, 16}; @@ -4236,7 +4236,7 @@ static bool ocl_sepColFilter2D(const UMat & buf, UMat & dst, const Mat & kernelY if (dst.depth() == CV_64F && !doubleSupport) return false; -#ifdef ANDROID +#ifdef __ANDROID__ size_t localsize[2] = { 16, 10 }; #else size_t localsize[2] = { 16, 16 }; diff --git a/modules/imgproc/src/morph.cpp b/modules/imgproc/src/morph.cpp index 39f5057a136a..bf35ee35eb6d 100644 --- a/modules/imgproc/src/morph.cpp +++ b/modules/imgproc/src/morph.cpp @@ -1635,7 +1635,7 @@ static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel, return true; } -#ifdef ANDROID +#ifdef __ANDROID__ size_t localThreads[2] = { 16, 8 }; #else size_t localThreads[2] = { 16, 16 }; @@ -1650,7 +1650,7 @@ static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel, if (localThreads[0]*localThreads[1] * 2 < (localThreads[0] + ksize.width - 1) * (localThreads[1] + ksize.height - 1)) return false; -#ifdef ANDROID +#ifdef __ANDROID__ if (dev.isNVidia()) return false; #endif diff --git a/modules/imgproc/src/smooth.cpp b/modules/imgproc/src/smooth.cpp index 4b4d510f42b6..45fe57caa3ee 100644 --- a/modules/imgproc/src/smooth.cpp +++ b/modules/imgproc/src/smooth.cpp @@ -3720,7 +3720,7 @@ static bool ocl_bilateralFilter_8u(InputArray _src, OutputArray _dst, int d, double sigma_color, double sigma_space, int borderType) { -#ifdef ANDROID +#ifdef __ANDROID__ if (ocl::Device::getDefault().isNVidia()) return false; #endif diff --git a/modules/imgproc/test/ocl/test_warp.cpp b/modules/imgproc/test/ocl/test_warp.cpp index c69d597f218b..26f9462d98fe 100644 --- a/modules/imgproc/test/ocl/test_warp.cpp +++ b/modules/imgproc/test/ocl/test_warp.cpp @@ -414,7 +414,7 @@ OCL_TEST_P(Remap_INTER_LINEAR, Mat) random_roi(); double eps = 2.0; -#ifdef ANDROID +#ifdef __ANDROID__ // TODO investigate accuracy if (cv::ocl::Device::getDefault().isNVidia()) eps = 8.0; diff --git a/modules/objdetect/src/detection_based_tracker.cpp b/modules/objdetect/src/detection_based_tracker.cpp index 4912948458b7..8583e502d31f 100644 --- a/modules/objdetect/src/detection_based_tracker.cpp +++ b/modules/objdetect/src/detection_based_tracker.cpp @@ -48,7 +48,7 @@ #define USE_STD_THREADS #endif -#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(ANDROID) || defined(USE_STD_THREADS) +#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || defined(USE_STD_THREADS) #include "opencv2/core/utility.hpp" @@ -69,7 +69,7 @@ #define DEBUGLOGS 0 #endif -#ifdef ANDROID +#ifdef __ANDROID__ #include #define LOG_TAG "OBJECT_DETECTOR" #define LOGD0(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)) diff --git a/modules/stitching/src/util_log.hpp b/modules/stitching/src/util_log.hpp index da454777cbec..edaaf380782c 100644 --- a/modules/stitching/src/util_log.hpp +++ b/modules/stitching/src/util_log.hpp @@ -11,7 +11,7 @@ // TODO remove LOG macros, add logging class #if ENABLE_LOG -#ifdef ANDROID +#ifdef __ANDROID__ #include #include #include diff --git a/modules/ts/include/opencv2/ts/ts_perf.hpp b/modules/ts/include/opencv2/ts/ts_perf.hpp index 5bbf1919f2e2..288d8d72b9a4 100644 --- a/modules/ts/include/opencv2/ts/ts_perf.hpp +++ b/modules/ts/include/opencv2/ts/ts_perf.hpp @@ -9,7 +9,7 @@ #include #if !(defined(LOGD) || defined(LOGI) || defined(LOGW) || defined(LOGE)) -# if defined(ANDROID) && defined(USE_ANDROID_LOGGING) +# if defined(__ANDROID__) && defined(USE_ANDROID_LOGGING) # include # define PERF_TESTS_LOG_TAG "OpenCV_perf" diff --git a/modules/ts/src/cuda_perf.cpp b/modules/ts/src/cuda_perf.cpp index 5d193340f948..db2af5eaa74a 100644 --- a/modules/ts/src/cuda_perf.cpp +++ b/modules/ts/src/cuda_perf.cpp @@ -237,7 +237,7 @@ namespace perf # else printf("[----------]\n[ GPU INFO ] \tRun on OS Windows x32.\n[----------]\n"), fflush(stdout); # endif - #elif defined ANDROID + #elif defined __ANDROID__ # if defined _LP64 || defined __LP64__ printf("[----------]\n[ GPU INFO ] \tRun on OS Android x64.\n[----------]\n"), fflush(stdout); # else diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp index 159437c44821..a30ff81686d0 100644 --- a/modules/ts/src/ts_perf.cpp +++ b/modules/ts/src/ts_perf.cpp @@ -15,7 +15,7 @@ #include "opencv2/core/cuda.hpp" #endif -#ifdef ANDROID +#ifdef __ANDROID__ # include #endif @@ -57,7 +57,7 @@ extern bool test_ipp_check; static int param_cuda_device; #endif -#ifdef ANDROID +#ifdef __ANDROID__ static int param_affinity_mask; static bool log_power_checkpoints; @@ -973,7 +973,7 @@ void TestBase::Init(const std::vector & availableImpls, "{ perf_strategy |default |specifies performance measuring strategy: default, base or simple (weak restrictions)}" "{ perf_read_validation_results | |specifies file name with performance results from previous run}" "{ perf_write_validation_results | |specifies file name to write performance validation results}" -#ifdef ANDROID +#ifdef __ANDROID__ "{ perf_time_limit |6.0 |default time limit for a single test (in seconds)}" "{ perf_affinity_mask |0 |set affinity mask for the main thread}" "{ perf_log_power_checkpoints | |additional xml logging for power measurement}" @@ -1044,7 +1044,7 @@ void TestBase::Init(const std::vector & availableImpls, #ifdef ENABLE_INSTRUMENTATION param_instrument = args.get("perf_instrument"); #endif -#ifdef ANDROID +#ifdef __ANDROID__ param_affinity_mask = args.get("perf_affinity_mask"); log_power_checkpoints = args.has("perf_log_power_checkpoints"); #endif @@ -1461,7 +1461,7 @@ bool TestBase::next() } } -#ifdef ANDROID +#ifdef __ANDROID__ if (log_power_checkpoints) { timeval tim; @@ -1758,7 +1758,7 @@ void TestBase::reportMetrics(bool toJUnitXML) const char* type_param = test_info->type_param(); const char* value_param = test_info->value_param(); -#if defined(ANDROID) && defined(USE_ANDROID_LOGGING) +#if defined(__ANDROID__) && defined(USE_ANDROID_LOGGING) LOGD("[ FAILED ] %s.%s", test_info->test_case_name(), test_info->name()); #endif @@ -1835,7 +1835,7 @@ void TestBase::SetUp() if (param_threads >= 0) cv::setNumThreads(param_threads); -#ifdef ANDROID +#ifdef __ANDROID__ if (param_affinity_mask) setCurrentThreadAffinityMask(param_affinity_mask); #endif diff --git a/modules/video/src/optflowgf.cpp b/modules/video/src/optflowgf.cpp index 69a7ea618924..cb2dc5948c8e 100644 --- a/modules/video/src/optflowgf.cpp +++ b/modules/video/src/optflowgf.cpp @@ -43,7 +43,7 @@ #include "precomp.hpp" #include "opencl_kernels_video.hpp" -#if defined __APPLE__ || defined ANDROID +#if defined __APPLE__ || defined __ANDROID__ #define SMALL_LOCALSIZE #endif diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp index 8e6397bdf919..31912de4938c 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp @@ -635,7 +635,7 @@ struct ImplMutex::Impl int refcount; }; -#elif defined __linux__ && !defined ANDROID +#elif defined __linux__ && !defined __ANDROID__ struct ImplMutex::Impl {