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] Proposed patch

bigredeye.patch (text/plain), 6.61 KB, created by mail on 2019-04-11 15:53:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mail

Created: 2019-04-11 15:53:12 UTC

Size: 6.61 KB

patch

obsolete

>diff -r 0ff5bbe35bf5 src/render/SDL_render.c
>--- a/src/render/SDL_render.c	Wed Apr 10 22:30:58 2019 -0300
>+++ b/src/render/SDL_render.c	Thu Apr 11 18:32:07 2019 +0300
>@@ -441,7 +441,7 @@
> static int
> QueueCmdSetDrawColor(SDL_Renderer *renderer, const Uint8 r, const Uint8 g, const Uint8 b, const Uint8 a)
> {
>-    const Uint32 color = ((a << 24) | (r << 16) | (g << 8) | b);
>+    const Uint32 color = (((Uint32)a << 24) | (r << 16) | (g << 8) | b);
>     int retval = 0;
>     
>     if (!renderer->color_queued || (color != renderer->last_queued_color)) {
>diff -r 0ff5bbe35bf5 src/render/opengl/SDL_render_gl.c
>--- a/src/render/opengl/SDL_render_gl.c	Wed Apr 10 22:30:58 2019 -0300
>+++ b/src/render/opengl/SDL_render_gl.c	Thu Apr 11 18:32:07 2019 +0300
>@@ -1104,7 +1104,7 @@
>                 const Uint8 g = cmd->data.color.g;
>                 const Uint8 b = cmd->data.color.b;
>                 const Uint8 a = cmd->data.color.a;
>-                const Uint32 color = ((a << 24) | (r << 16) | (g << 8) | b);
>+                const Uint32 color = (((Uint32)a << 24) | (r << 16) | (g << 8) | b);
>                 if (color != data->drawstate.color) {
>                     data->glColor4f((GLfloat) r * inv255f,
>                                     (GLfloat) g * inv255f,
>@@ -1142,7 +1142,7 @@
>                 const Uint8 g = cmd->data.color.g;
>                 const Uint8 b = cmd->data.color.b;
>                 const Uint8 a = cmd->data.color.a;
>-                const Uint32 color = ((a << 24) | (r << 16) | (g << 8) | b);
>+                const Uint32 color = (((Uint32)a << 24) | (r << 16) | (g << 8) | b);
>                 if (color != data->drawstate.clear_color) {
>                     const GLfloat fr = ((GLfloat) r) * inv255f;
>                     const GLfloat fg = ((GLfloat) g) * inv255f;
>diff -r 0ff5bbe35bf5 src/render/opengles/SDL_render_gles.c
>--- a/src/render/opengles/SDL_render_gles.c	Wed Apr 10 22:30:58 2019 -0300
>+++ b/src/render/opengles/SDL_render_gles.c	Thu Apr 11 18:32:07 2019 +0300
>@@ -709,7 +709,7 @@
>     const Uint8 g = cmd->data.draw.g;
>     const Uint8 b = cmd->data.draw.b;
>     const Uint8 a = cmd->data.draw.a;
>-    const Uint32 color = ((a << 24) | (r << 16) | (g << 8) | b);
>+    const Uint32 color = (((Uint32)a << 24) | (r << 16) | (g << 8) | b);
> 
>     if (color != data->drawstate.color) {
>         const GLfloat fr = ((GLfloat) r) * inv255f;
>@@ -856,7 +856,7 @@
>                 const Uint8 g = cmd->data.color.g;
>                 const Uint8 b = cmd->data.color.b;
>                 const Uint8 a = cmd->data.color.a;
>-                const Uint32 color = ((a << 24) | (r << 16) | (g << 8) | b);
>+                const Uint32 color = (((Uint32)a << 24) | (r << 16) | (g << 8) | b);
>                 if (color != data->drawstate.clear_color) {
>                     const GLfloat fr = ((GLfloat) r) * inv255f;
>                     const GLfloat fg = ((GLfloat) g) * inv255f;
>diff -r 0ff5bbe35bf5 src/render/opengles2/SDL_render_gles2.c
>--- a/src/render/opengles2/SDL_render_gles2.c	Wed Apr 10 22:30:58 2019 -0300
>+++ b/src/render/opengles2/SDL_render_gles2.c	Thu Apr 11 18:32:07 2019 +0300
>@@ -1235,7 +1235,7 @@
>                 const Uint8 g = cmd->data.color.g;
>                 const Uint8 b = colorswap ? cmd->data.color.r : cmd->data.color.b;
>                 const Uint8 a = cmd->data.color.a;
>-                data->drawstate.color = ((a << 24) | (r << 16) | (g << 8) | b);
>+                data->drawstate.color = (((Uint32)a << 24) | (r << 16) | (g << 8) | b);
>                 break;
>             }
> 
>@@ -1267,7 +1267,7 @@
>                 const Uint8 g = cmd->data.color.g;
>                 const Uint8 b = colorswap ? cmd->data.color.r : cmd->data.color.b;
>                 const Uint8 a = cmd->data.color.a;
>-                const Uint32 color = ((a << 24) | (r << 16) | (g << 8) | b);
>+                const Uint32 color = (((Uint32)a << 24) | (r << 16) | (g << 8) | b);
>                 if (color != data->drawstate.clear_color) {
>                     const GLfloat fr = ((GLfloat) r) * inv255f;
>                     const GLfloat fg = ((GLfloat) g) * inv255f;
>diff -r 0ff5bbe35bf5 src/render/psp/SDL_render_psp.c
>--- a/src/render/psp/SDL_render_psp.c	Wed Apr 10 22:30:58 2019 -0300
>+++ b/src/render/psp/SDL_render_psp.c	Thu Apr 11 18:32:07 2019 +0300
>@@ -730,7 +730,7 @@
>                 const Uint8 g = cmd->data.color.g;
>                 const Uint8 b = cmd->data.color.b;
>                 const Uint8 a = cmd->data.color.a;
>-                const Uint32 color = ((a << 24) | (b << 16) | (g << 8) | r);
>+                const Uint32 color = (((Uint32)a << 24) | (b << 16) | (g << 8) | r);
>                 /* !!! FIXME: we could cache drawstate like clear color */
>                 sceGuClearColor(color);
>                 sceGuClearDepth(0);
>@@ -745,7 +745,7 @@
>                 const Uint8 g = cmd->data.draw.g;
>                 const Uint8 b = cmd->data.draw.b;
>                 const Uint8 a = cmd->data.draw.a;
>-                const Uint32 color = ((a << 24) | (b << 16) | (g << 8) | r);
>+                const Uint32 color = (((Uint32)a << 24) | (b << 16) | (g << 8) | r);
>                 /* !!! FIXME: we could cache draw state like color, texturing, etc */
>                 sceGuColor(color);
>                 sceGuDisable(GU_TEXTURE_2D);
>@@ -763,7 +763,7 @@
>                 const Uint8 g = cmd->data.draw.g;
>                 const Uint8 b = cmd->data.draw.b;
>                 const Uint8 a = cmd->data.draw.a;
>-                const Uint32 color = ((a << 24) | (b << 16) | (g << 8) | r);
>+                const Uint32 color = (((Uint32)a << 24) | (b << 16) | (g << 8) | r);
>                 /* !!! FIXME: we could cache draw state like color, texturing, etc */
>                 sceGuColor(color);
>                 sceGuDisable(GU_TEXTURE_2D);
>@@ -781,7 +781,7 @@
>                 const Uint8 g = cmd->data.draw.g;
>                 const Uint8 b = cmd->data.draw.b;
>                 const Uint8 a = cmd->data.draw.a;
>-                const Uint32 color = ((a << 24) | (b << 16) | (g << 8) | r);
>+                const Uint32 color = (((Uint32)a << 24) | (b << 16) | (g << 8) | r);
>                 /* !!! FIXME: we could cache draw state like color, texturing, etc */
>                 sceGuColor(color);
>                 sceGuDisable(GU_TEXTURE_2D);
>diff -r 0ff5bbe35bf5 src/video/x11/edid-parse.c
>--- a/src/video/x11/edid-parse.c	Wed Apr 10 22:30:58 2019 -0300
>+++ b/src/video/x11/edid-parse.c	Thu Apr 11 18:32:07 2019 +0300
>@@ -76,7 +76,7 @@
> 
>     /* Serial Number */
>     info->serial_number =
>-	edid[0x0c] | edid[0x0d] << 8 | edid[0x0e] << 16 | edid[0x0f] << 24;
>+	edid[0x0c] | edid[0x0d] << 8 | edid[0x0e] << 16 | ((Uint32)edid[0x0f] << 24);
> 
>     /* Week and Year */
>     is_model_year = FALSE;

Actions: View | Diff

Attachments on bug 4590: 3741

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.