[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/opengl
Michael Meeks
michael.meeks at collabora.com
Sat Feb 13 16:00:53 UTC 2016
vcl/opengl/salbmp.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit ecadfaebf757838278e5351fb240b4bfc351ff08
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Tue Feb 9 17:15:29 2016 +0000
tdf#97816 - vcl: opengl - clear the user buffer after greyscale conversion.
Change-Id: Ie87fc935bf69b5eb2c620e60d041fb95b544ec96
Reviewed-on: https://gerrit.libreoffice.org/22243
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
Tested-by: Tomaž Vajngerl <quikee at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/22329
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index e0205f0..18c2ce3 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -940,6 +940,10 @@ bool OpenGLSalBitmap::ConvertToGreyscale()
mnBits = 8;
maPalette = Bitmap::GetGreyPalette(256);
+ // AllocateUserData will handle the rest.
+ maUserBuffer.reset();
+ mbDirtyTexture = false;
+
CHECK_GL_ERROR();
return true;
}
More information about the Libreoffice-commits
mailing list