From: ouv <ouv@opencascade.com>
Date: Wed, 13 Jun 2012 11:37:25 +0000 (+0000)
Subject: Issue 0001109: External: Dump view regression on Linux
X-Git-Tag: CTH_1_8_0~24
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a2ac66fe7ba943ad6950ea315d4ab1483ddb98a9;p=modules%2Fgui.git

Issue 0001109: External: Dump view regression on Linux
---

diff --git a/src/GLViewer/GLViewer_FrameBuffer.cxx b/src/GLViewer/GLViewer_FrameBuffer.cxx
index 51e7ee9b5..b47bed1bc 100755
--- a/src/GLViewer/GLViewer_FrameBuffer.cxx
+++ b/src/GLViewer/GLViewer_FrameBuffer.cxx
@@ -89,7 +89,7 @@ static PFNGLDELETERENDERBUFFERSEXTPROC vglDeleteRenderbuffersEXT = NULL;
 #define GL_GetProcAddress( x ) wglGetProcAddress( (const LPCSTR)x )
 #endif
 
-bool InitializeEXT()
+bool GLViewer_InitializeEXT()
 {
   vglGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)GL_GetProcAddress( "glGenFramebuffersEXT" );
   vglBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)GL_GetProcAddress( "glBindFramebufferEXT" );
@@ -125,7 +125,7 @@ GLViewer_FrameBuffer::~GLViewer_FrameBuffer()
 
 bool GLViewer_FrameBuffer::init( const GLsizei& xSize, const GLsizei& ySize )
 {
-  myIsInitializeEXT = InitializeEXT();
+  myIsInitializeEXT = GLViewer_InitializeEXT();
   char* ext = (char*)glGetString( GL_EXTENSIONS );
   if( !myIsInitializeEXT || strstr( ext, "GL_EXT_framebuffer_object" ) == NULL )
     return false;
diff --git a/src/SVTK/SVTK_FrameBuffer.cxx b/src/SVTK/SVTK_FrameBuffer.cxx
index b078e5bec..ef06addea 100644
--- a/src/SVTK/SVTK_FrameBuffer.cxx
+++ b/src/SVTK/SVTK_FrameBuffer.cxx
@@ -91,7 +91,7 @@ static PFNGLDELETERENDERBUFFERSEXTPROC vglDeleteRenderbuffersEXT = NULL;
 #define GL_GetProcAddress( x ) wglGetProcAddress( (const LPCSTR)x )
 #endif
 
-bool InitializeEXT()
+bool SVTK_InitializeEXT()
 {
   vglGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)GL_GetProcAddress( "glGenFramebuffersEXT" );
   vglBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)GL_GetProcAddress( "glBindFramebufferEXT" );
@@ -112,7 +112,7 @@ bool InitializeEXT()
   return ok;
 }
 
-static bool IsEXTInitialized = InitializeEXT();
+static bool IsEXTInitialized = SVTK_InitializeEXT();
 
 SVTK_FrameBuffer::SVTK_FrameBuffer()
   : textureId( 0 ),