[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-3' - vcl/source

[Tomaž Vajngerl]

 vcl/source/gdi/impimage.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit bcbf852f8cb7ebde5f506d53fdcc837d439be475
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Mon Oct 12 10:49:26 2015 +0200

    tdf#94384 fix black icons with OpenGL enabled on Windows
    
    Windows specific code in ImplUpdateDisplayBmp causes the black
    icons when OpenGL is enabled. This change disables this code
    path.
    
    (cherry picked from commit c97ca26f2d5790d46b712813c15bb6731f0232b0)
    
    Change-Id: I3ae1a0ceb947254aaadbc3d772f0d662b291b594
    Reviewed-on: https://gerrit.libreoffice.org/19367
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 8ea787e..4acbc62 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -29,6 +29,10 @@
 #include <image.h>
 #include <boost/scoped_array.hpp>
 
+#if defined WNT
+#include <vcl/opengl/OpenGLHelper.hxx>
+#endif
+
 #define IMPSYSIMAGEITEM_MASK        ( 0x01 )
 #define IMPSYSIMAGEITEM_ALPHA       ( 0x02 )
 
@@ -336,7 +340,7 @@ pOutDev
     if( !mpDisplayBmp && !maBmpEx.IsEmpty() )
     {
 #if defined WNT
-        if( !maBmpEx.IsAlpha() )
+        if( !maBmpEx.IsAlpha() && !OpenGLHelper::isVCLOpenGLEnabled())
         {
             // FIXME: this looks like rather an obsolete code-path to me.
             const Bitmap aBmp( maBmpEx.GetBitmap().CreateDisplayBitmap( pOutDev ) );