fix some warnings

This commit is contained in:
Xaver Hugl 2022-12-21 21:20:04 +01:00
parent 1d98333660
commit e3586f7dbf
2 changed files with 3 additions and 3 deletions

View file

@ -20,7 +20,7 @@ public:
TilesEditorEffect(); TilesEditorEffect();
~TilesEditorEffect() override; ~TilesEditorEffect() override;
void reconfigure(ReconfigureFlags); void reconfigure(ReconfigureFlags) override;
int animationDuration() const; int animationDuration() const;
void setAnimationDuration(int duration); void setAnimationDuration(int duration);

View file

@ -740,11 +740,11 @@ QImage GLTexture::toImage() const
GLint currentTextureBinding; GLint currentTextureBinding;
glGetIntegerv(GL_TEXTURE_BINDING_2D, &currentTextureBinding); glGetIntegerv(GL_TEXTURE_BINDING_2D, &currentTextureBinding);
if (currentTextureBinding != texture()) { if (GLuint(currentTextureBinding) != texture()) {
glBindTexture(GL_TEXTURE_2D, texture()); glBindTexture(GL_TEXTURE_2D, texture());
} }
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, ret.bits()); glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, ret.bits());
if (currentTextureBinding != texture()) { if (GLuint(currentTextureBinding) != texture()) {
glBindTexture(GL_TEXTURE_2D, currentTextureBinding); glBindTexture(GL_TEXTURE_2D, currentTextureBinding);
} }
return ret; return ret;