Issue 0001109: External: Dump view regression on Linux

diff --git a/src/GLViewer/GLViewer_FrameBuffer.cxx b/src/GLViewer/GLViewer_FrameBuffer.cxx
index 51e7ee9b58a6f65557cad7050dc6abbd96ff431d..b47bed1bc87df9090dc5c59a43b1f425c0a1f006 100755 (executable)
--- 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 b078e5bec4ee240ab006357bf70863a4f52d99cf..ef06addead05f7eaac6b57d752e0a230d5837c28 100644 (file)
--- 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 ),