restored source compatibility

diff --git a/modules/core/include/opencv2/core/internal.hpp b/modules/core/include/opencv2/core/internal.hpp
index 8423f5a..5335fa0 100644 (file)
--- a/modules/core/include/opencv2/core/internal.hpp
+++ b/modules/core/include/opencv2/core/internal.hpp
@@ -752,7 +752,7 @@ typedef struct CvBigFuncTable
 
 #ifdef __cplusplus
 
-// Deprecated
+// < Deprecated
 
 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 = "");
 
+// >
+
+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 // __OPENCV_CORE_INTERNAL_HPP__

diff --git a/modules/core/include/opencv2/core/opengl_interop.hpp b/modules/core/include/opencv2/core/opengl_interop.hpp
index 04d8b8c..178a949 100644 (file)
--- a/modules/core/include/opencv2/core/opengl_interop.hpp
+++ b/modules/core/include/opencv2/core/opengl_interop.hpp
@@ -46,17 +46,10 @@
 #ifdef __cplusplus
 
 #include "opencv2/core/core.hpp"
+#include "opencv2/core/opengl_interop_deprecated.hpp"
 
 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 ///////////////////
 
 //! Smart pointer for OpenGL buffer memory with reference counting.