[Libreoffice-commits] core.git: vcl/opengl

Jochen Nitschke j.nitschke+logerrit at ok.de
Sun May 1 00:33:03 UTC 2016


 vcl/opengl/texture.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 039b75d6cdc26dcce03e37c67115405e6f2a8ebe
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun May 1 02:28:34 2016 +0200

    follow-up for tinderbox fix
    
    > vcl/opengl/texture.cxx:53:5:
    > error: calling static member function through member call syntax,
    > use 'TextureState::generate' instead [loplugin:staticcall]
    
    Change-Id: Ie550549fb23b0199014ed41adcc2f3da8c4d1520
    Reviewed-on: https://gerrit.libreoffice.org/24544
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Tested-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index e9fca75..aa796eb 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -50,7 +50,7 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nWidth, int nHeight, bool bAllocate )
     OpenGLVCLContextZone aContextZone;
 
     auto& rState = OpenGLContext::getVCLContext()->state();
-    rState->texture().generate(mnTexture);
+    TextureState::generate(mnTexture);
     rState->texture().active(0);
     rState->texture().bind(mnTexture);
 
@@ -86,7 +86,7 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nX, int nY, int nWidth, int nHeight )
     // nY = GetHeight() - nHeight - nY;
 
     auto& rState = OpenGLContext::getVCLContext()->state();
-    rState->texture().generate(mnTexture);
+    TextureState::generate(mnTexture);
     rState->texture().active(0);
     rState->texture().bind(mnTexture);
 
@@ -116,7 +116,7 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nWidth, int nHeight, int nFormat, int
     OpenGLVCLContextZone aContextZone;
 
     auto& rState = OpenGLContext::getVCLContext()->state();
-    rState->texture().generate(mnTexture);
+    TextureState::generate(mnTexture);
     rState->texture().active(0);
     rState->texture().bind(mnTexture);
 


More information about the Libreoffice-commits mailing list