ooo-build r13162 - trunk/patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Fri Jul 11 15:59:06 2008
New Revision: 13162
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13162&view=rev

Log:
m22 compile fix if OGLTrans is enabled


Added:
   trunk/patches/dev300/transogl-buildfix.diff
Modified:
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul 11 15:59:06 2008
@@ -1749,6 +1749,9 @@
 [ OpenGLTransitions ]
 transogl-detect-fix.diff
 
+[ OpenGLTransitions >= dev300-m22 < beb300-m0 ]
+transogl-buildfix.diff
+
 [ Experimental ]
 # sal_uInt32 -> sal_uIntPtr for events on some places
 events-intptr.diff, i#59411, jholesov

Added: trunk/patches/dev300/transogl-buildfix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/transogl-buildfix.diff	Fri Jul 11 15:59:06 2008
@@ -0,0 +1,20 @@
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.ark	2008-07-11 17:18:34.807632724 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-07-11 17:23:10.853192428 +0200
+@@ -700,7 +700,7 @@ void OGLTransitionerImpl::GLInitSlides()
+     {
+ 	if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
+ 	    glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width,
+-			 SlideSize.Height, &LeavingBytes[0]);
++			 SlideSize.Height, 0, pDetectedFormat->eFormat, GL_UNSIGNED_BYTE, &LeavingBytes[0]);
+ 	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
+ 	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
+ 	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
+@@ -755,7 +755,7 @@ void OGLTransitionerImpl::GLInitSlides()
+     else
+     {
+ 	if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
+-	    glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
++	    glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, SlideSize.Height, 0, pDetectedFormat->eFormat, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
+ 	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
+ 	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
+ 	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);