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

restored source compatibility

Browse Source
This commit is contained in:
Vladislav Vinogradov 2013-02-21 12:31:04 +04:00
parent a938534a7e
commit 21f95a3b11
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/core/include/opencv2/core/internal.hpp
View File

@ -752,7 +752,7 @@ typedef struct CvBigFuncTable
#ifdef __cplusplus #ifdef __cplusplus
// Deprecated // < Deprecated
class CV_EXPORTS CvOpenGlFuncTab class CV_EXPORTS CvOpenGlFuncTab
{ {
@ -779,6 +779,18 @@ CV_EXPORTS void icvSetOpenGlFuncTab(const CvOpenGlFuncTab* tab);
CV_EXPORTS bool icvCheckGlError(const char* file, const int line, const char* func = ""); CV_EXPORTS bool icvCheckGlError(const char* file, const int line, const char* func = "");
// >
namespace cv { namespace ogl {
CV_EXPORTS bool checkError(const char* file, const int line, const char* func = "");
}}
#if defined(__GNUC__)
#define CV_CheckGlError() CV_DbgAssert( (cv::ogl::checkError(__FILE__, __LINE__, __func__)) )
#else
#define CV_CheckGlError() CV_DbgAssert( (cv::ogl::checkError(__FILE__, __LINE__)) )
#endif
#endif //__cplusplus #endif //__cplusplus
#endif // __OPENCV_CORE_INTERNAL_HPP__ #endif // __OPENCV_CORE_INTERNAL_HPP__

9
modules/core/include/opencv2/core/opengl_interop.hpp
View File

@ -46,17 +46,10 @@
#ifdef __cplusplus #ifdef __cplusplus
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
#include "opencv2/core/opengl_interop_deprecated.hpp"
namespace cv { namespace ogl { namespace cv { namespace ogl {
CV_EXPORTS bool checkError(const char* file, const int line, const char* func = "");
#if defined(__GNUC__)
#define CV_CheckGlError() CV_DbgAssert( (cv::gl::checkError(__FILE__, __LINE__, __func__)) )
#else
#define CV_CheckGlError() CV_DbgAssert( (cv::gl::checkError(__FILE__, __LINE__)) )
#endif
/////////////////// OpenGL Objects /////////////////// /////////////////// OpenGL Objects ///////////////////
//! Smart pointer for OpenGL buffer memory with reference counting. //! Smart pointer for OpenGL buffer memory with reference counting.