applied_patches/0568-transogl-buildfix.diff

   1 --- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.ark  2008-07-11 17:18:34.807632724 +0200
   2 +++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx      2008-07-11 17:23:10.853192428 +0200
   3 @@ -700,7 +700,7 @@ void OGLTransitionerImpl::GLInitSlides()
   4      {
   5         if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
   6             glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width,
   7 -                        SlideSize.Height, &LeavingBytes[0]);
   8 +                        SlideSize.Height, 0, pDetectedFormat->eFormat, GL_UNSIGNED_BYTE, &LeavingBytes[0]);
   9             glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
  10             glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
  11             glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
  12 @@ -755,7 +755,7 @@ void OGLTransitionerImpl::GLInitSlides()
  13      else
  14      {
  15         if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
  16 -           glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
  17 +           glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, SlideSize.Height, 0, pDetectedFormat->eFormat, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
  18             glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
  19             glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
  20             glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);