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

[Michael Meeks]

 vcl/opengl/gdiimpl.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit e66076c33b5875e68167b53fd9d663f4abd566c8
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Dec 23 13:37:33 2015 +0000

    tdf#96690 - don't copy tiny non-rendered-to virtual devices.
    
    Change-Id: Ic9d90bb7f652599b5a6ce303aa026b7e4e255324
    Reviewed-on: https://gerrit.libreoffice.org/21091
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 73a2c82..c236125 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1649,6 +1649,13 @@ void OpenGLSalGraphicsImpl::DoCopyBits( const SalTwoRect& rPosAry, OpenGLSalGrap
 {
     VCL_GL_INFO( "::copyBits" );
 
+    if( !rImpl.maOffscreenTex )
+    {
+        VCL_GL_INFO( "::copyBits - skipping copy of un-initialized framebuffer contents of size "
+                     << rImpl.GetWidth() << "x" << rImpl.GetHeight() );
+        return;
+    }
+
     if( &rImpl == this &&
         (rPosAry.mnSrcWidth == rPosAry.mnDestWidth) &&
         (rPosAry.mnSrcHeight == rPosAry.mnDestHeight))