[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-1' - vcl/opengl

[Michael Meeks]

 vcl/opengl/salbmp.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit baf7dd2db7f61b90c0d63db4326034d76bfe2300
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/22330
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

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;
 }