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

[Tomaž Vajngerl]

 vcl/source/gdi/impimage.cxx |   23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 15195fb801b354a2f2356aa3cea0a06b9eb1e066
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
    
    Looks like the Windows specific code in ImplUpdateDisplayBmp is
    not needed anymore and causes problems with OpenGL. The icons after
    the change still seem to be drawn correctly with OpenGL enabled
    or disabled.
    
    Change-Id: I3ae1a0ceb947254aaadbc3d772f0d662b291b594
    (cherry picked from commit c97ca26f2d5790d46b712813c15bb6731f0232b0)
    Reviewed-on: https://gerrit.libreoffice.org/19346
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 8ea787e..ce6323f 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -327,28 +327,11 @@ void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev,
     }
 }
 
-void ImplImageBmp::ImplUpdateDisplayBmp( OutputDevice*
-#if defined WNT
-pOutDev
-#endif
-)
+void ImplImageBmp::ImplUpdateDisplayBmp(OutputDevice*)
 {
-    if( !mpDisplayBmp && !maBmpEx.IsEmpty() )
+    if (!mpDisplayBmp && !maBmpEx.IsEmpty())
     {
-#if defined WNT
-        if( !maBmpEx.IsAlpha() )
-        {
-            // FIXME: this looks like rather an obsolete code-path to me.
-            const Bitmap aBmp( maBmpEx.GetBitmap().CreateDisplayBitmap( pOutDev ) );
-
-            if( maBmpEx.IsTransparent() )
-                mpDisplayBmp = new BitmapEx( aBmp, maBmpEx.GetMask().CreateDisplayBitmap( pOutDev ) );
-            else
-                mpDisplayBmp = new BitmapEx( aBmp );
-        }
-        else
-#endif
-            mpDisplayBmp = new BitmapEx( maBmpEx );
+        mpDisplayBmp = new BitmapEx(maBmpEx);
     }
 }