diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-10-12 10:49:26 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-10-12 11:39:24 +0200 |
| commit | c97ca26f2d5790d46b712813c15bb6731f0232b0 (patch) | |
| tree | 242353b9b1dacdd0870e9d4341dac18f1f7a4a4f | |
| parent | 78a4e9cb89830191e77c558759e845e5a15b9cc7 (diff) | |
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
| -rw-r--r-- | vcl/source/gdi/impimage.cxx | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index d3f63f45869d..76e65a3a3bb1 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -328,28 +328,11 @@ void ImplImageBmp::Draw( 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); } } |