Kaydet (Commit) c97ca26f authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

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
üst 78a4e9cb
...@@ -328,28 +328,11 @@ void ImplImageBmp::Draw( OutputDevice* pOutDev, ...@@ -328,28 +328,11 @@ void ImplImageBmp::Draw( OutputDevice* pOutDev,
} }
} }
void ImplImageBmp::ImplUpdateDisplayBmp( OutputDevice* void ImplImageBmp::ImplUpdateDisplayBmp(OutputDevice*)
#if defined WNT
pOutDev
#endif
)
{ {
if( !mpDisplayBmp && !maBmpEx.IsEmpty() ) if (!mpDisplayBmp && !maBmpEx.IsEmpty())
{ {
#if defined WNT mpDisplayBmp = new BitmapEx(maBmpEx);
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 );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment