Skip to content

O
opencv
Commit ec3eb141 authored by Ilya Lavrenov's avatar Ilya Lavrenov
Browse files
Options

unused function in case of unavailable OpenGL

parent 983799d3
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 8 deletions
modules/core/src/opengl.cpp
View file @ ec3eb141
...@@ -58,16 +58,9 @@ namespace ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment