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

[Michael Meeks]

 vcl/opengl/scale.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 9c091100e2e4d604efbf5414663e8174ad18ea60
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Feb 10 00:46:17 2016 +0000

    tdf#97700 - vcl: opengl - fix memory corrupting size mis-match.
    
    Change-Id: Iab49a20c85f9deb3e8c60a782050aa4c12b663ad
    Reviewed-on: https://gerrit.libreoffice.org/22253
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 80bbdd6..a971b15e 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -68,6 +68,8 @@ bool OpenGLSalBitmap::ImplScaleFilter(
 
     mnWidth = nNewWidth;
     mnHeight = nNewHeight;
+    mnBufWidth = mnWidth;
+    mnBufHeight = mnHeight;
     maTexture = aNewTex;
 
     CHECK_GL_ERROR();
@@ -181,6 +183,8 @@ bool OpenGLSalBitmap::ImplScaleConvolution(
 
     mnWidth = nNewWidth;
     mnHeight = nNewHeight;
+    mnBufWidth = mnWidth;
+    mnBufHeight = mnHeight;
 
     CHECK_GL_ERROR();
     return true;
@@ -256,6 +260,8 @@ bool OpenGLSalBitmap::ImplScaleArea( const rtl::Reference< OpenGLContext > &xCon
 
     mnWidth = nNewWidth;
     mnHeight = nNewHeight;
+    mnBufWidth = mnWidth;
+    mnBufHeight = mnHeight;
 
     CHECK_GL_ERROR();
     return true;