potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

build: detect Android via '__ANDROID__' macro

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/opengl.cpp
+2 -2
View File
@@ -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 <EGL/egl.h>
# elif defined(__linux__)
# include <GL/glx.h>
@@ -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(),