We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Suggested fix

shapedfix.patch (text/plain), 1.35 KB, created by Bogomancer on 2017-07-11 13:29:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bogomancer

Created: 2017-07-11 13:29:39 UTC

Size: 1.35 KB

patch

obsolete

>diff -r 4c165b1a0596 src/video/SDL_shape.c
>--- a/src/video/SDL_shape.c	Mon Jul 10 18:40:35 2017 -0700
>+++ b/src/video/SDL_shape.c	Tue Jul 11 14:50:04 2017 +0300
>@@ -74,11 +74,14 @@
>     int y = 0;
>     Uint8 r = 0,g = 0,b = 0,alpha = 0;
>     Uint8* pixel = NULL;
>-    Uint32 bitmap_pixel,pixel_value = 0,mask_value = 0;
>+    Uint32 pixel_value = 0,mask_value = 0;
>+    int bytes_per_scanline = (shape->w + (ppb - 1)) / ppb;
>+    Uint8 *bitmap_scanline;
>     SDL_Color key;
>     if(SDL_MUSTLOCK(shape))
>         SDL_LockSurface(shape);
>     for(y = 0;y<shape->h;y++) {
>+        bitmap_scanline = bitmap + y * bytes_per_scanline;
>         for(x=0;x<shape->w;x++) {
>             alpha = 0;
>             pixel_value = 0;
>@@ -98,7 +101,6 @@
>                     break;
>             }
>             SDL_GetRGBA(pixel_value,shape->format,&r,&g,&b,&alpha);
>-            bitmap_pixel = y*shape->w + x;
>             switch(mode.mode) {
>                 case(ShapeModeDefault):
>                     mask_value = (alpha >= 1 ? 1 : 0);
>@@ -114,7 +116,7 @@
>                     mask_value = ((key.r != r || key.g != g || key.b != b) ? 1 : 0);
>                     break;
>             }
>-            bitmap[bitmap_pixel / ppb] |= mask_value << (7 - ((ppb - 1) - (bitmap_pixel % ppb)));
>+            bitmap_scanline[x / ppb] |= mask_value << (x % ppb);
>         }
>     }
>     if(SDL_MUSTLOCK(shape))

Actions: View | Diff

Attachments on bug 3699: 2795

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.