ooo-build r13160 - trunk/patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Fri Jul 11 14:48:48 2008
New Revision: 13160
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13160&view=rev

Log:
Compile fix


Modified:
   trunk/patches/dev300/transogl-more-transitions.diff

Modified: trunk/patches/dev300/transogl-more-transitions.diff
==============================================================================
--- trunk/patches/dev300/transogl-more-transitions.diff	(original)
+++ trunk/patches/dev300/transogl-more-transitions.diff	Fri Jul 11 14:48:48 2008
@@ -130,7 +130,7 @@
 +    else
 +    {
 +	if( pTransition && !bBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
-+	    glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
++	    glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, SlideSize.Height, 0, Format, 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);