Attachment 312758 Details for Bug 456845 – upstream patch to fix

[patch] upstream patch to fix

workspace.vcl82.patch (text/plain), 1.81 KB, created by Caolan McNamara on 2008-07-28 09:14:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2008-07-28 09:14:13 UTC

Size: 1.81 KB

patch

obsolete

>Index: gsl/vcl/unx/gtk/window/gtkframe.cxx
>diff -u gsl/vcl/unx/gtk/window/gtkframe.cxx:1.68 gsl/vcl/unx/gtk/window/gtkframe.cxx:1.67.6.2
>--- gsl/vcl/unx/gtk/window/gtkframe.cxx:1.68	Thu Aug 30 06:55:50 2007
>+++ gsl/vcl/unx/gtk/window/gtkframe.cxx	Fri Sep  7 07:32:01 2007
>@@ -1112,8 +1112,42 @@
>         ResId aResId( nOffsets[nIndex] + nIcon, *ImplGetResMgr() );
>         BitmapEx aIcon( aResId );
> 
>+        // #i81083# convert to 24bit/8bit alpha bitmap
>+        Bitmap aBmp = aIcon.GetBitmap();
>+        if( aBmp.GetBitCount() != 24 || ! aIcon.IsAlpha() )
>+        {
>+            if( aBmp.GetBitCount() != 24 )
>+                aBmp.Convert( BMP_CONVERSION_24BIT );
>+            AlphaMask aMask;
>+            if( ! aIcon.IsAlpha() )
>+            {
>+                switch( aIcon.GetTransparentType() )
>+                {
>+                    case TRANSPARENT_NONE:
>+                    {
>+                        BYTE nTrans = 0;
>+                        aMask = AlphaMask( aBmp.GetSizePixel(), &nTrans );
>+                    }
>+                    break;
>+                    case TRANSPARENT_COLOR:
>+                        aMask = AlphaMask( aBmp.CreateMask( aIcon.GetTransparentColor() ) );
>+                    break;
>+                    case TRANSPARENT_BITMAP:
>+                        aMask = AlphaMask( aIcon.GetMask() );
>+                    break;
>+                    default:
>+                        DBG_ERROR( "unhandled transparent type" );
>+                    break;
>+                }
>+            }
>+            else
>+                aMask = aIcon.GetAlpha();
>+            aIcon = BitmapEx( aBmp, aMask );
>+        }
>+        
>         ImpBitmap *pIconImpBitmap = aIcon.ImplGetBitmapImpBitmap();
>         ImpBitmap *pIconImpMask   = aIcon.ImplGetMaskImpBitmap();
>+        
> 
>         if( pIconImpBitmap && pIconImpMask )
>         {

Actions: View | Diff

Attachments on bug 456845: 312758