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.

full patch for shadow

diff_shadow_all.txt (text/plain), 15.71 KB, created by Sylvain on 2014-06-22 20:41:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2014-06-22 20:41:42 UTC

Size: 15.71 KB

patch

obsolete

>diff -r c23ffe72934c configure
>--- a/configure	Sun Jun 22 11:02:56 2014 -0700
>+++ b/configure	Sun Jun 22 22:38:41 2014 +0200
>@@ -23374,7 +23374,7 @@
> esac
> 
> CheckWarnAll
>-#CheckWarnShadow
>+CheckWarnShadow
> 
> # Verify that we have all the platform specific files we need
> 
>diff -r c23ffe72934c configure.in
>--- a/configure.in	Sun Jun 22 11:02:56 2014 -0700
>+++ b/configure.in	Sun Jun 22 22:38:41 2014 +0200
>@@ -3238,7 +3238,7 @@
> 
> dnl Do this on all platforms, after everything else.
> CheckWarnAll
>-#CheckWarnShadow
>+CheckWarnShadow
> 
> # Verify that we have all the platform specific files we need
> 
>diff -r c23ffe72934c src/thread/SDL_thread.c
>--- a/src/thread/SDL_thread.c	Sun Jun 22 11:02:56 2014 -0700
>+++ b/src/thread/SDL_thread.c	Sun Jun 22 22:38:41 2014 +0200
>@@ -442,10 +442,10 @@
>         SDL_SYS_DetachThread(thread);
>     } else {
>         /* all other states are pretty final, see where we landed. */
>-        const int state = SDL_AtomicGet(&thread->state);
>-        if ((state == SDL_THREAD_STATE_DETACHED) || (state == SDL_THREAD_STATE_CLEANED)) {
>+        const int thread_state = SDL_AtomicGet(&thread->state);
>+        if ((thread_state == SDL_THREAD_STATE_DETACHED) || (thread_state == SDL_THREAD_STATE_CLEANED)) {
>             return;  /* already detached (you shouldn't call this twice!) */
>-        } else if (state == SDL_THREAD_STATE_ZOMBIE) {
>+        } else if (thread_state == SDL_THREAD_STATE_ZOMBIE) {
>             SDL_WaitThread(thread, NULL);  /* already done, clean it up. */
>         } else {
>             SDL_assert(0 && "Unexpected thread state");
>diff -r c23ffe72934c src/video/SDL_RLEaccel.c
>--- a/src/video/SDL_RLEaccel.c	Sun Jun 22 11:02:56 2014 -0700
>+++ b/src/video/SDL_RLEaccel.c	Sun Jun 22 22:38:41 2014 +0200
>@@ -376,10 +376,10 @@
>  * right. Top clipping has already been taken care of.
>  */
> static void
>-RLEClipBlit(int w, Uint8 * srcbuf, SDL_Surface * dst,
>+RLEClipBlit(int w, Uint8 * srcbuf, SDL_Surface * surf_dst,
>             Uint8 * dstbuf, SDL_Rect * srcrect, unsigned alpha)
> {
>-    SDL_PixelFormat *fmt = dst->format;
>+    SDL_PixelFormat *fmt = surf_dst->format;
> 
> #define RLECLIPBLIT(bpp, Type, do_blit)                    \
>     do {                                   \
>@@ -418,7 +418,7 @@
>         break;                             \
>         if(ofs == w) {                         \
>         ofs = 0;                           \
>-        dstbuf += dst->pitch;                      \
>+        dstbuf += surf_dst->pitch;                      \
>         if(!--linecount)                       \
>             break;                         \
>         }                                  \
>@@ -434,18 +434,18 @@
> 
> /* blit a colorkeyed RLE surface */
> int
>-SDL_RLEBlit(SDL_Surface * src, SDL_Rect * srcrect,
>-            SDL_Surface * dst, SDL_Rect * dstrect)
>+SDL_RLEBlit(SDL_Surface * surf_src, SDL_Rect * srcrect,
>+            SDL_Surface * surf_dst, SDL_Rect * dstrect)
> {
>     Uint8 *dstbuf;
>     Uint8 *srcbuf;
>     int x, y;
>-    int w = src->w;
>+    int w = surf_src->w;
>     unsigned alpha;
> 
>     /* Lock the destination if necessary */
>-    if (SDL_MUSTLOCK(dst)) {
>-        if (SDL_LockSurface(dst) < 0) {
>+    if (SDL_MUSTLOCK(surf_dst)) {
>+        if (SDL_LockSurface(surf_dst) < 0) {
>             return (-1);
>         }
>     }
>@@ -453,9 +453,9 @@
>     /* Set up the source and destination pointers */
>     x = dstrect->x;
>     y = dstrect->y;
>-    dstbuf = (Uint8 *) dst->pixels
>-        + y * dst->pitch + x * src->format->BytesPerPixel;
>-    srcbuf = (Uint8 *) src->map->data;
>+    dstbuf = (Uint8 *) surf_dst->pixels
>+        + y * surf_dst->pitch + x * surf_src->format->BytesPerPixel;
>+    srcbuf = (Uint8 *) surf_src->map->data;
> 
>     {
>         /* skip lines at the top if necessary */
>@@ -481,7 +481,7 @@
>             }               \
>         }
> 
>-            switch (src->format->BytesPerPixel) {
>+            switch (surf_src->format->BytesPerPixel) {
>             case 1:
>                 RLESKIP(1, Uint8);
>                 break;
>@@ -501,12 +501,12 @@
>         }
>     }
> 
>-    alpha = src->map->info.a;
>+    alpha = surf_src->map->info.a;
>     /* if left or right edge clipping needed, call clip blit */
>-    if (srcrect->x || srcrect->w != src->w) {
>-        RLEClipBlit(w, srcbuf, dst, dstbuf, srcrect, alpha);
>+    if (srcrect->x || srcrect->w != surf_src->w) {
>+        RLEClipBlit(w, srcbuf, surf_dst, dstbuf, srcrect, alpha);
>     } else {
>-        SDL_PixelFormat *fmt = src->format;
>+        SDL_PixelFormat *fmt = surf_src->format;
> 
> #define RLEBLIT(bpp, Type, do_blit)                       \
>         do {                                  \
>@@ -525,7 +525,7 @@
>             break;                            \
>             if(ofs == w) {                        \
>             ofs = 0;                          \
>-            dstbuf += dst->pitch;                     \
>+            dstbuf += surf_dst->pitch;                     \
>             if(!--linecount)                      \
>                 break;                        \
>             }                                 \
>@@ -539,8 +539,8 @@
> 
>   done:
>     /* Unlock the destination if necessary */
>-    if (SDL_MUSTLOCK(dst)) {
>-        SDL_UnlockSurface(dst);
>+    if (SDL_MUSTLOCK(surf_dst)) {
>+        SDL_UnlockSurface(surf_dst);
>     }
>     return (0);
> }
>@@ -620,10 +620,10 @@
> 
> /* blit a pixel-alpha RLE surface clipped at the right and/or left edges */
> static void
>-RLEAlphaClipBlit(int w, Uint8 * srcbuf, SDL_Surface * dst,
>+RLEAlphaClipBlit(int w, Uint8 * srcbuf, SDL_Surface * surf_dst,
>                  Uint8 * dstbuf, SDL_Rect * srcrect)
> {
>-    SDL_PixelFormat *df = dst->format;
>+    SDL_PixelFormat *df = surf_dst->format;
>     /*
>      * clipped blitter: Ptype is the destination pixel type,
>      * Ctype the translucent count type, and do_blend the macro
>@@ -693,7 +693,7 @@
>             ofs += run;                       \
>         }                             \
>         } while(ofs < w);                         \
>-        dstbuf += dst->pitch;                     \
>+        dstbuf += surf_dst->pitch;                     \
>     } while(--linecount);                         \
>     } while(0)
> 
>@@ -712,25 +712,25 @@
> 
> /* blit a pixel-alpha RLE surface */
> int
>-SDL_RLEAlphaBlit(SDL_Surface * src, SDL_Rect * srcrect,
>-                 SDL_Surface * dst, SDL_Rect * dstrect)
>+SDL_RLEAlphaBlit(SDL_Surface * surf_src, SDL_Rect * srcrect,
>+                 SDL_Surface * surf_dst, SDL_Rect * dstrect)
> {
>     int x, y;
>-    int w = src->w;
>+    int w = surf_src->w;
>     Uint8 *srcbuf, *dstbuf;
>-    SDL_PixelFormat *df = dst->format;
>+    SDL_PixelFormat *df = surf_dst->format;
> 
>     /* Lock the destination if necessary */
>-    if (SDL_MUSTLOCK(dst)) {
>-        if (SDL_LockSurface(dst) < 0) {
>+    if (SDL_MUSTLOCK(surf_dst)) {
>+        if (SDL_LockSurface(surf_dst) < 0) {
>             return -1;
>         }
>     }
> 
>     x = dstrect->x;
>     y = dstrect->y;
>-    dstbuf = (Uint8 *) dst->pixels + y * dst->pitch + x * df->BytesPerPixel;
>-    srcbuf = (Uint8 *) src->map->data + sizeof(RLEDestFormat);
>+    dstbuf = (Uint8 *) surf_dst->pixels + y * surf_dst->pitch + x * df->BytesPerPixel;
>+    srcbuf = (Uint8 *) surf_src->map->data + sizeof(RLEDestFormat);
> 
>     {
>         /* skip lines at the top if necessary */
>@@ -789,8 +789,8 @@
>     }
> 
>     /* if left or right edge clipping needed, call clip blit */
>-    if (srcrect->x || srcrect->w != src->w) {
>-        RLEAlphaClipBlit(w, srcbuf, dst, dstbuf, srcrect);
>+    if (srcrect->x || srcrect->w != surf_src->w) {
>+        RLEAlphaClipBlit(w, srcbuf, surf_dst, dstbuf, srcrect);
>     } else {
> 
>         /*
>@@ -839,7 +839,7 @@
>             ofs += run;                  \
>             }                            \
>         } while(ofs < w);                    \
>-        dstbuf += dst->pitch;                    \
>+        dstbuf += surf_dst->pitch;                    \
>         } while(--linecount);                    \
>     } while(0)
> 
>@@ -859,8 +859,8 @@
> 
>   done:
>     /* Unlock the destination if necessary */
>-    if (SDL_MUSTLOCK(dst)) {
>-        SDL_UnlockSurface(dst);
>+    if (SDL_MUSTLOCK(surf_dst)) {
>+        SDL_UnlockSurface(surf_dst);
>     }
>     return 0;
> }
>diff -r c23ffe72934c src/video/SDL_blit.h
>--- a/src/video/SDL_blit.h	Sun Jun 22 11:02:56 2014 -0700
>+++ b/src/video/SDL_blit.h	Sun Jun 22 22:38:41 2014 +0200
>@@ -402,18 +402,18 @@
> {                                                                       \
>     switch (bpp) {                                                      \
>         case 1: {                                                       \
>-            Uint8 Pixel;                                                \
>+            Uint8 Pixel__;                                              \
>                                                                         \
>-            PIXEL_FROM_RGBA(Pixel, fmt, r, g, b, a);                    \
>-            *((Uint8 *)(buf)) = Pixel;                                  \
>+            PIXEL_FROM_RGBA(Pixel__, fmt, r, g, b, a);                  \
>+            *((Uint8 *)(buf)) = Pixel__;                                \
>         }                                                               \
>         break;                                                          \
>                                                                         \
>         case 2: {                                                       \
>-            Uint16 Pixel;                                               \
>+            Uint16 Pixel__;                                             \
>                                                                         \
>-            PIXEL_FROM_RGBA(Pixel, fmt, r, g, b, a);                    \
>-            *((Uint16 *)(buf)) = Pixel;                                 \
>+            PIXEL_FROM_RGBA(Pixel__, fmt, r, g, b, a);                  \
>+            *((Uint16 *)(buf)) = Pixel__;                               \
>         }                                                               \
>         break;                                                          \
>                                                                         \
>@@ -431,10 +431,10 @@
>         break;                                                          \
>                                                                         \
>         case 4: {                                                       \
>-            Uint32 Pixel;                                               \
>+            Uint32 Pixel__;                                             \
>                                                                         \
>-            PIXEL_FROM_RGBA(Pixel, fmt, r, g, b, a);                    \
>-            *((Uint32 *)(buf)) = Pixel;                                 \
>+            PIXEL_FROM_RGBA(Pixel__, fmt, r, g, b, a);                  \
>+            *((Uint32 *)(buf)) = Pixel__;                               \
>         }                                                               \
>         break;                                                          \
>     }                                                                   \
>diff -r c23ffe72934c src/video/SDL_video.c
>--- a/src/video/SDL_video.c	Sun Jun 22 11:02:56 2014 -0700
>+++ b/src/video/SDL_video.c	Sun Jun 22 22:38:41 2014 +0200
>@@ -235,13 +235,10 @@
> SDL_CreateWindowTexture(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch)
> {
>     SDL_WindowTextureData *data;
>-    SDL_RendererInfo info;
>-    Uint32 i;
> 
>     data = SDL_GetWindowData(window, SDL_WINDOWTEXTUREDATA);
>     if (!data) {
>         SDL_Renderer *renderer = NULL;
>-        SDL_RendererInfo info;
>         int i;
>         const char *hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION);
> 
>@@ -249,6 +246,7 @@
>         if (hint && *hint != '0' && *hint != '1' &&
>             SDL_strcasecmp(hint, "software") != 0) {
>             for (i = 0; i < SDL_GetNumRenderDrivers(); ++i) {
>+                SDL_RendererInfo info;
>                 SDL_GetRenderDriverInfo(i, &info);
>                 if (SDL_strcasecmp(info.name, hint) == 0) {
>                     renderer = SDL_CreateRenderer(window, i, 0);
>@@ -259,6 +257,7 @@
>         
>         if (!renderer) {
>             for (i = 0; i < SDL_GetNumRenderDrivers(); ++i) {
>+                SDL_RendererInfo info;
>                 SDL_GetRenderDriverInfo(i, &info);
>                 if (SDL_strcmp(info.name, "software") != 0) {
>                     renderer = SDL_CreateRenderer(window, i, 0);
>@@ -291,17 +290,23 @@
>     SDL_free(data->pixels);
>     data->pixels = NULL;
> 
>-    if (SDL_GetRendererInfo(data->renderer, &info) < 0) {
>-        return -1;
>-    }
>-
>-    /* Find the first format without an alpha channel */
>-    *format = info.texture_formats[0];
>-    for (i = 0; i < info.num_texture_formats; ++i) {
>-        if (!SDL_ISPIXELFORMAT_FOURCC(info.texture_formats[i]) &&
>-            !SDL_ISPIXELFORMAT_ALPHA(info.texture_formats[i])) {
>-            *format = info.texture_formats[i];
>-            break;
>+    {
>+        SDL_RendererInfo info;
>+        Uint32 i;
>+
>+        if (SDL_GetRendererInfo(data->renderer, &info) < 0) {
>+            return -1;
>+        }
>+
>+        /* Find the first format without an alpha channel */
>+        *format = info.texture_formats[0];
>+
>+        for (i = 0; i < info.num_texture_formats; ++i) {
>+            if (!SDL_ISPIXELFORMAT_FOURCC(info.texture_formats[i]) &&
>+                    !SDL_ISPIXELFORMAT_ALPHA(info.texture_formats[i])) {
>+                *format = info.texture_formats[i];
>+                break;
>+            }
>         }
>     }
> 
>diff -r c23ffe72934c src/video/x11/SDL_x11modes.c
>--- a/src/video/x11/SDL_x11modes.c	Sun Jun 22 11:02:56 2014 -0700
>+++ b/src/video/x11/SDL_x11modes.c	Sun Jun 22 22:38:41 2014 +0200
>@@ -674,7 +674,6 @@
>     int screen_w;
>     int screen_h;
>     SDL_DisplayMode mode;
>-    SDL_DisplayModeData *modedata;
> 
>     /* Unfortunately X11 requires the window to be created with the correct
>      * visual and depth ahead of time, but the SDL API allows you to create
>@@ -692,6 +691,7 @@
>     if (data->use_xinerama) {
>         if (data->use_vidmode && !data->xinerama_info.x_org && !data->xinerama_info.y_org &&
>            (screen_w > data->xinerama_info.width || screen_h > data->xinerama_info.height)) {
>+            SDL_DisplayModeData *modedata;
>             /* Add the full (both screens combined) xinerama mode only on the display that starts at 0,0
>              * if we're using vidmode.
>              */
>@@ -707,6 +707,7 @@
>         }
>         else if (!data->use_xrandr)
>         {
>+            SDL_DisplayModeData *modedata;
>             /* Add the current mode of each monitor otherwise if we can't get them from xrandr */
>             mode.w = data->xinerama_info.width;
>             mode.h = data->xinerama_info.height;
>@@ -759,6 +760,7 @@
>     if (data->use_vidmode &&
>         X11_XF86VidModeGetAllModeLines(display, data->vidmode_screen, &nmodes, &modes)) {
>         int i;
>+        SDL_DisplayModeData *modedata;
> 
> #ifdef X11MODES_DEBUG
>         printf("VidMode modes: (unsorted)\n");
>@@ -787,6 +789,7 @@
> #endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
> 
>     if (!data->use_xrandr && !data->use_vidmode) {
>+        SDL_DisplayModeData *modedata;
>         /* Add the desktop mode */
>         mode = sdl_display->desktop_mode;
>         modedata = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
>diff -r c23ffe72934c src/video/x11/edid-parse.c
>--- a/src/video/x11/edid-parse.c	Sun Jun 22 11:02:56 2014 -0700
>+++ b/src/video/x11/edid-parse.c	Sun Jun 22 22:38:41 2014 +0200
>@@ -548,7 +548,6 @@
> void
> dump_monitor_info (MonitorInfo *info)
> {
>-    char *s;
>     int i;
>     
>     printf ("Checksum: %d (%s)\n",
>@@ -601,6 +600,7 @@
>     }
>     else
>     {
>+       const char *s;
> 	printf ("Video Signal Level: %f\n", info->analog.video_signal_level);
> 	printf ("Sync Signal Level: %f\n", info->analog.sync_signal_level);
> 	printf ("Total Signal Level: %f\n", info->analog.total_signal_level);

Actions: View

Attachments on bug 2556: 1701 | 1702

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.