[Libreoffice-commits] .: slideshow/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jan 10 14:03:56 PST 2013


 slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 294ec42e765ae478c00b3a2051e04224c30f47a4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jan 11 00:03:34 2013 +0200

    Copy/paste error
    
    Change-Id: I9e4ba84eb1cc3dff8c39369a9da32dd49839ecef

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
index e2f1a58..ea8bdb6 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
@@ -93,7 +93,7 @@ bool OGLShaders::Initialize()
         cbInitialized = true;
 #elif defined(MACOSX)
 #else
-        glActiveTexture = (PFNGLCREATESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glActiveTexture" );
+        glActiveTexture = (PFNGLACTIVETEXTUREPROC) unx::glXGetProcAddress( (unsigned char *) "glActiveTexture" );
         glCreateShader = (PFNGLCREATESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCreateShader" );
         glShaderSource = (PFNGLSHADERSOURCEPROC) unx::glXGetProcAddress( (unsigned char *) "glShaderSource" );
         glCompileShader = (PFNGLCOMPILESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCompileShader" );


More information about the Libreoffice-commits mailing list