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] Patch to fix the SDL_LowerBlitScaled problem.

SDL_LowerBlitScaled_bug_20110727.diff (text/plain), 1.51 KB, created by Beoran on 2011-07-27 06:06:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Beoran

Created: 2011-07-27 06:06:28 UTC

Size: 1.51 KB

patch

obsolete

>diff -r 0c407e6d14a9 src/video/SDL_surface.c
>--- a/src/video/SDL_surface.c	Mon Jul 25 15:03:42 2011 -0700
>+++ b/src/video/SDL_surface.c	Wed Jul 27 14:56:07 2011 +0200
>@@ -697,13 +697,20 @@
> SDL_LowerBlitScaled(SDL_Surface * src, SDL_Rect * srcrect,
>                 SDL_Surface * dst, SDL_Rect * dstrect)
> {
>+    SDL_Rect oldsrc_rect, olddst_rect;
>+    int result;
>+
>+    /* Save original clip rectangles. */
>+    SDL_GetClipRect(src, &oldsrc_rect);
>+    SDL_GetClipRect(dst, &olddst_rect);
>+
>     /* Save off the original dst width, height */
>     int dstW = dstrect->w;
>     int dstH = dstrect->h;
>     SDL_Rect final_dst = *dstrect;
>     SDL_Rect final_src = *srcrect;
> 
>-    /* Clip the dst surface to the dstrect */
>+    /* Clip the dst surface to the dstrect. */
>     SDL_SetClipRect( dst, &final_dst );
> 
>     /* Did the dst width change? */
>@@ -724,12 +731,20 @@
>     src->map->info.flags |= SDL_COPY_NEAREST;
> 
>     if ( src->format->format == dst->format->format && !SDL_ISPIXELFORMAT_INDEXED(src->format->format) ) {
>-        return SDL_SoftStretch( src, &final_src, dst, &final_dst );
>+        result = SDL_SoftStretch( src, &final_src, dst, &final_dst );
>     } else {
>-        return SDL_LowerBlit( src, &final_src, dst, &final_dst );
>+        result = SDL_LowerBlit( src, &final_src, dst, &final_dst );
>     }
>+
>+    /* Restore original clip rectangles. */
>+    SDL_SetClipRect(src, &oldsrc_rect);
>+    SDL_SetClipRect(dst, &olddst_rect);
>+
>+    return result;
> }
> 
>+
>+
> /*
>  * Lock a surface to directly access the pixels
>  */

Actions: View | Diff

Attachments on bug 1257: 659

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.