vcl/inc/opengl/RenderState.hxx | 6 +++---
vcl/inc/opengl/TextureState.hxx | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 75850b0af2f62a5ef91661da78c21656dd83276e
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Sat Apr 30 22:22:12 2016 +0200
fix for tinderbox
>vcl/inc/opengl/TextureState.hxx:28:10:
> error: this method can be declared static TextureState::generate
> [loplugin:staticmethods]
>vcl/inc/opengl/RenderState.hxx:22:10:
> error: this method can be declared static
GenericCapabilityState::readState
> [loplugin:staticmethods]
>vcl/inc/opengl/RenderState.hxx:24:17:
> error: implicit conversion (IntegralCast) from 'GLboolean'
> (aka 'unsigned char') to 'int'
> [loplugin:implicitboolconversion]
Change-Id: Iafcfe6c88b7e570d7c73a9e8920fdd7c6248ad7b
Reviewed-on: https://gerrit.libreoffice.org/24541
Reviewed-by: Jochen Nitschke <j.nitschke+loger...@ok.de>
Tested-by: Jochen Nitschke <j.nitschke+loger...@ok.de>
diff --git a/vcl/inc/opengl/RenderState.hxx b/vcl/inc/opengl/RenderState.hxx
index ac215a8..7f79f51 100644
--- a/vcl/inc/opengl/RenderState.hxx
+++ b/vcl/inc/opengl/RenderState.hxx
@@ -19,10 +19,10 @@ class GenericCapabilityState
protected:
bool mbTest;
- bool readState()
+ static bool readState()
{
- return (glIsEnabled(ENUM_TYPE) == GL_TRUE);
- };
+ return (glIsEnabled(ENUM_TYPE) == static_cast<GLboolean>(GL_TRUE));
+ }
public:
void sync()
diff --git a/vcl/inc/opengl/TextureState.hxx b/vcl/inc/opengl/TextureState.hxx
index 945b3b4..fbf2b9c 100644
--- a/vcl/inc/opengl/TextureState.hxx
+++ b/vcl/inc/opengl/TextureState.hxx
@@ -25,7 +25,7 @@ public:
, maBoundTextures(4, 0)
{}
- void generate(GLuint& nTexture)
+ static void generate(GLuint& nTexture)
{
glGenTextures(1, &nTexture);
CHECK_GL_ERROR();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
