applied_patches/0563-transogl-dispose-fix.diff

   1 --- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.ogldispose~  2008-07-07 21:19:54.633849842 +0200
   2 +++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx      2008-07-07 21:21:53.434096522 +0200
   3 @@ -223,6 +223,7 @@ void OGLTransitionerImpl::initialize( co
   4          /* TODO: check for version once the bug in fglrx driver is fixed */
   5          cbBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 );
   6
   7 +        instance->disposing();
   8          delete instance;
   9          initialized = true;
  10      }
  11 @@ -403,6 +404,10 @@ bool OGLTransitionerImpl::initWindowFrom
  12         wglMakeCurrent(GLWin.hDC,GLWin.hRC);
  13  #elif defined( UNX )
  14      glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx );
  15 +    if( glGetError() != GL_NO_ERROR ) {
  16 +           OSL_TRACE("glError: %s\n", (char *)gluErrorString(glGetError()));
  17 +           return false;
  18 +    }
  19  #endif
  20      glEnable(GL_CULL_FACE);
  21      glCullFace(GL_BACK);
  22 @@ -806,7 +811,10 @@ void OGLTransitionerImpl::disposing()
  23  #elif defined( UNX )
  24      if(GLWin.ctx)
  25         {
  26 -           OSL_ENSURE( glXMakeCurrent(GLWin.dpy, None, NULL) , "Error releasing glX context" );
  27 +        glXMakeCurrent(GLWin.dpy, None, NULL);
  28 +        if( glGetError() != GL_NO_ERROR ) {
  29 +            OSL_TRACE("glError: %s\n", (char *)gluErrorString(glGetError()));
  30 +        }
  31                 glXDestroyContext(GLWin.dpy, GLWin.ctx);
  32                 GLWin.ctx = NULL;
  33         }
  34 @@ -897,7 +905,7 @@ public:
  35              return uno::Reference< presentation::XTransition >();
  36
  37
  38 -        OGLTransitionImpl* pTransition;
  39 +        OGLTransitionImpl* pTransition = NULL;
  40
  41          if( transitionType == animations::TransitionType::MISCSHAPEWIPE ) {
  42              pTransition = new OGLTransitionImpl();