fixed #2297, #2300; fixed several warnings

2012-08-28 13:45:35 +04:00
parent 95d54196db
commit 0bd68a70f1
12 changed files with 27 additions and 22 deletions
--- a/modules/core/src/opengl_interop.cpp
+++ b/modules/core/src/opengl_interop.cpp
@@ -113,13 +113,13 @@ namespace

    const CvOpenGlFuncTab* g_glFuncTab = 0;

-//#ifdef HAVE_CUDA
+#if defined HAVE_CUDA || defined HAVE_OPENGL
    const CvOpenGlFuncTab* glFuncTab()
    {
        static EmptyGlFuncTab empty;
        return g_glFuncTab ? g_glFuncTab : &empty;
    }
-//#endif
+#endif
 }

 CvOpenGlFuncTab::~CvOpenGlFuncTab()