Attachment 19690 Details for Bug 4491 – Minimal patch to correct icon data alignment

[patch] Minimal patch to correct icon data alignment

cygwin-fdo-bugzilla-4491-transparent-icon-background-fix.patch (text/plain), 1.46 KB, created by Jon Turney on 2008-10-16 05:25:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Turney

Created: 2008-10-16 05:25:55 UTC

Size: 1.46 KB

patch

obsolete

>Fix for mis-aligned icon data creates bad background masks 
>fd.o bugzilla #4491
>
>Transparent icon backgrounds appear with black stripes as mask data is incorrectly aligned.
>Modified the icon DDB bitmap data alignment to 16 bits
>
>---
> xserver/hw/xwin/winmultiwindowicons.c |   10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>Index: xorg-git/xserver/hw/xwin/winmultiwindowicons.c
>===================================================================
>--- xorg-git.orig/xserver/hw/xwin/winmultiwindowicons.c
>+++ xorg-git/xserver/hw/xwin/winmultiwindowicons.c
>@@ -83,8 +83,8 @@ winScaleXBitmapToWindows (int iconSize,
>   if (pixmap->drawable.depth == 15)
>     effXDepth = 16;
> 
>-  /* Need 32-bit aligned rows */
>-  stride = ((iconSize * effBPP + 31) & (~31)) / 8;
>+  /* Need 16-bit aligned rows for DDBitmaps */
>+  stride = ((iconSize * effBPP + 15) & (~15)) / 8;
>   xStride = PixmapBytePad (pixmap->drawable.width, pixmap->drawable.depth);
>   if (stride == 0 || xStride == 0)
>     {
>@@ -296,11 +296,11 @@ winXIconToHICON (WindowPtr pWin, int ico
>   else
>     effBPP = bpp;
>   
>-  /* Need 32-bit aligned rows */
>-  stride = ((iconSize * effBPP + 31) & (~31)) / 8;
>+  /* Need 16-bit aligned rows for DDBitmaps */
>+  stride = ((iconSize * effBPP + 15) & (~15)) / 8;
> 
>   /* Mask is 1-bit deep */
>-  maskStride = ((iconSize * 1 + 31) & (~31)) / 8; 
>+  maskStride = ((iconSize * 1 + 15) & (~15)) / 8;
> 
>   image = malloc (stride * iconSize);
>   imageMask = malloc (stride * iconSize);

Actions: View | Splinter Review

Attachments on bug 4491: 3311 | 3330 | 19690 | 20378 | 20540 | 20546 | 28480

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.