generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2254 from ilya-lavrenov:opengl

Browse Source
This commit is contained in:
Roman Donchenko 2014-02-03 12:11:27 +04:00 committed by OpenCV Buildbot
commit c967069922
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/core/src/opengl.cpp
View File

@ -58,16 +58,9 @@ namespace
inline void throw_no_ogl() { CV_Error(cv::Error::OpenGlNotSupported, "The library is compiled without OpenGL support"); } inline void throw_no_ogl() { CV_Error(cv::Error::OpenGlNotSupported, "The library is compiled without OpenGL support"); }
#else #else
inline void throw_no_ogl() { CV_Error(cv::Error::OpenGlApiCallError, "OpenGL context doesn't exist"); } inline void throw_no_ogl() { CV_Error(cv::Error::OpenGlApiCallError, "OpenGL context doesn't exist"); }
#endif
bool checkError(const char* file, const int line, const char* func = 0) bool checkError(const char* file, const int line, const char* func = 0)
{ {
#ifndef HAVE_OPENGL
(void) file;
(void) line;
(void) func;
return true;
#else
GLenum err = gl::GetError(); GLenum err = gl::GetError();
if (err != gl::NO_ERROR_) if (err != gl::NO_ERROR_)
@ -102,8 +95,8 @@ namespace
} }
return true; return true;
#endif
} }
#endif
#define CV_CheckGlError() CV_DbgAssert( (checkError(__FILE__, __LINE__, CV_Func)) ) #define CV_CheckGlError() CV_DbgAssert( (checkError(__FILE__, __LINE__, CV_Func)) )
} // namespace } // namespace