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

Luboš Luňák l.lunak at collabora.com
Wed Jan 21 05:59:57 PST 2015


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

New commits:
commit a6440c4f785aa5f29b3af409cd0d8fa198198d72
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Mon Jan 19 22:36:40 2015 +0100

    do not draw with SALCOLOR_NONE
    
    Change-Id: I882a42f58ac298d333985068b2fe6ef9ac198c8b
    Signed-off-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 9584056..b286023 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -404,6 +404,8 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor )
 // Like UseSolid(), but sets up for AA drawing, which uses gradients to create the AA.
 bool OpenGLSalGraphicsImpl::UseSolidAA( SalColor nColor, double fTransparency )
 {
+    if( nColor == SALCOLOR_NONE )
+        return false;
     if( !mrParent.getAntiAliasB2DDraw())
         return UseSolid( nColor );
     if( !UseProgram( "textureVertexShader", "linearGradientFragmentShader" ) )


More information about the Libreoffice-commits mailing list