From 4c1a3ccd4533a37d885fea79ed633162db196e2d Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 7 Apr 2025 20:43:00 +0300
Subject: [PATCH] rename local vars 'pixel' to 'pixelvalue'
Reference issue: https://github.com/libsdl-org/SDL/issues/12749.
---
src/render/software/SDL_triangle.c | 6 +-
src/video/SDL_blit_0.c | 12 +-
src/video/SDL_blit_1.c | 8 +-
src/video/SDL_blit_auto.c | 664 ++++++++++++++---------------
src/video/SDL_blit_slow.c | 46 +-
src/video/SDL_bmp.c | 12 +-
src/video/SDL_pixels.c | 6 +-
7 files changed, 377 insertions(+), 377 deletions(-)
diff --git a/src/render/software/SDL_triangle.c b/src/render/software/SDL_triangle.c
index 3023006eb600c..2a4d150b884e2 100644
--- a/src/render/software/SDL_triangle.c
+++ b/src/render/software/SDL_triangle.c
@@ -945,9 +945,9 @@ static void SDL_BlitTriangle_Slow(SDL_BlitInfo *info,
ASSEMBLE_RGB(dst, dstbpp, dst_fmt, dstR, dstG, dstB);
} else {
// SDL_PIXELFORMAT_ARGB2101010
- Uint32 pixel;
- ARGB2101010_FROM_RGBA(pixel, dstR, dstG, dstB, dstA);
- *(Uint32 *)dst = pixel;
+ Uint32 pixelvalue;
+ ARGB2101010_FROM_RGBA(pixelvalue, dstR, dstG, dstB, dstA);
+ *(Uint32 *)dst = pixelvalue;
}
}
TRIANGLE_END_LOOP
diff --git a/src/video/SDL_blit_0.c b/src/video/SDL_blit_0.c
index 0d05bddfb1a32..c5070efea4fd9 100644
--- a/src/video/SDL_blit_0.c
+++ b/src/video/SDL_blit_0.c
@@ -617,7 +617,7 @@ static void BlitBtoNAlpha(SDL_BlitInfo *info)
const SDL_PixelFormatDetails *dstfmt = info->dst_fmt;
int srcbpp, dstbpp;
int c;
- Uint32 pixel, mask, align;
+ Uint32 pixelvalue, mask, align;
unsigned sR, sG, sB;
unsigned dR, dG, dB, dA;
const unsigned A = info->a;
@@ -646,7 +646,7 @@ static void BlitBtoNAlpha(SDL_BlitInfo *info)
sR = srcpal[bit].r;
sG = srcpal[bit].g;
sB = srcpal[bit].b;
- DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
+ DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixelvalue, dR, dG, dB, dA);
ALPHA_BLEND_RGBA(sR, sG, sB, A, dR, dG, dB, dA);
ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
}
@@ -668,7 +668,7 @@ static void BlitBtoNAlpha(SDL_BlitInfo *info)
sR = srcpal[bit].r;
sG = srcpal[bit].g;
sB = srcpal[bit].b;
- DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
+ DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixelvalue, dR, dG, dB, dA);
ALPHA_BLEND_RGBA(sR, sG, sB, A, dR, dG, dB, dA);
ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
}
@@ -694,7 +694,7 @@ static void BlitBtoNAlphaKey(SDL_BlitInfo *info)
const SDL_Color *srcpal = info->src_pal->colors;
int srcbpp, dstbpp;
int c;
- Uint32 pixel, mask, align;
+ Uint32 pixelvalue, mask, align;
unsigned sR, sG, sB;
unsigned dR, dG, dB, dA;
const unsigned A = info->a;
@@ -724,7 +724,7 @@ static void BlitBtoNAlphaKey(SDL_BlitInfo *info)
sR = srcpal[bit].r;
sG = srcpal[bit].g;
sB = srcpal[bit].b;
- DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
+ DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixelvalue, dR, dG, dB, dA);
ALPHA_BLEND_RGBA(sR, sG, sB, A, dR, dG, dB, dA);
ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
}
@@ -746,7 +746,7 @@ static void BlitBtoNAlphaKey(SDL_BlitInfo *info)
sR = srcpal[bit].r;
sG = srcpal[bit].g;
sB = srcpal[bit].b;
- DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
+ DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixelvalue, dR, dG, dB, dA);
ALPHA_BLEND_RGBA(sR, sG, sB, A, dR, dG, dB, dA);
ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
}
diff --git a/src/video/SDL_blit_1.c b/src/video/SDL_blit_1.c
index e08561028970f..dda2e35843ed7 100644
--- a/src/video/SDL_blit_1.c
+++ b/src/video/SDL_blit_1.c
@@ -434,7 +434,7 @@ static void Blit1toNAlpha(SDL_BlitInfo *info)
const SDL_PixelFormatDetails *dstfmt = info->dst_fmt;
const SDL_Color *srcpal = info->src_pal->colors;
int dstbpp;
- Uint32 pixel;
+ Uint32 pixelvalue;
unsigned sR, sG, sB, sA;
unsigned dR, dG, dB, dA;
const unsigned A = info->a;
@@ -450,7 +450,7 @@ static void Blit1toNAlpha(SDL_BlitInfo *info)
sG = srcpal[*src].g;
sB = srcpal[*src].b;
sA = (srcpal[*src].a * A) / 255;
- DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
+ DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixelvalue, dR, dG, dB, dA);
ALPHA_BLEND_RGBA(sR, sG, sB, sA, dR, dG, dB, dA);
ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
src++;
@@ -475,7 +475,7 @@ static void Blit1toNAlphaKey(SDL_BlitInfo *info)
const SDL_Color *srcpal = info->src_pal->colors;
Uint32 ckey = info->colorkey;
int dstbpp;
- Uint32 pixel;
+ Uint32 pixelvalue;
unsigned sR, sG, sB, sA;
unsigned dR, dG, dB, dA;
const unsigned A = info->a;
@@ -492,7 +492,7 @@ static void Blit1toNAlphaKey(SDL_BlitInfo *info)
sG = srcpal[*src].g;
sB = srcpal[*src].b;
sA = (srcpal[*src].a * A) / 255;
- DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
+ DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixelvalue, dR, dG, dB, dA);
ALPHA_BLEND_RGBA(sR, sG, sB, sA, dR, dG, dB, dA);
ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
}
diff --git a/src/video/SDL_blit_auto.c b/src/video/SDL_blit_auto.c
index d9bf67335ff84..27cd9c714eef4 100644
--- a/src/video/SDL_blit_auto.c
+++ b/src/video/SDL_blit_auto.c
@@ -185,7 +185,7 @@ static void SDL_Blit_XRGB8888_XRGB8888_Modulate(SDL_BlitInfo *info)
const Uint32 modulateR = info->r;
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint32 R, G, B;
while (info->dst_h--) {
@@ -193,15 +193,15 @@ static void SDL_Blit_XRGB8888_XRGB8888_Modulate(SDL_BlitInfo *info)
Uint32 *dst = (Uint32 *)info->dst;
int n = info->dst_w;
while (n--) {
- pixel = *src;
- R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+ pixelvalue = *src;
+ R = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); B = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (R << 16) | (G << 8) | B;
- *dst = pixel;
+ pixelvalue = (R << 16) | (G << 8) | B;
+ *dst = pixelvalue;
++src;
++dst;
}
@@ -216,7 +216,7 @@ static void SDL_Blit_XRGB8888_XRGB8888_Modulate_Scale(SDL_BlitInfo *info)
const Uint32 modulateR = info->r;
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint32 R, G, B;
Uint64 srcy, srcx;
Uint64 posy, posx;
@@ -236,15 +236,15 @@ static void SDL_Blit_XRGB8888_XRGB8888_Modulate_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+ pixelvalue = *src;
+ R = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); B = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (R << 16) | (G << 8) | B;
- *dst = pixel;
+ pixelvalue = (R << 16) | (G << 8) | B;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -449,7 +449,7 @@ static void SDL_Blit_XRGB8888_XRGB8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
static void SDL_Blit_XRGB8888_XBGR8888_Scale(SDL_BlitInfo *info)
{
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint32 R, G, B;
Uint64 srcy, srcx;
Uint64 posy, posx;
@@ -469,10 +469,10 @@ static void SDL_Blit_XRGB8888_XBGR8888_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
- pixel = (B << 16) | (G << 8) | R;
- *dst = pixel;
+ pixelvalue = *src;
+ R = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); B = (Uint8)pixelvalue;
+ pixelvalue = (B << 16) | (G << 8) | R;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -609,7 +609,7 @@ static void SDL_Blit_XRGB8888_XBGR8888_Modulate(SDL_BlitInfo *info)
const Uint32 modulateR = info->r;
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint32 R, G, B;
while (info->dst_h--) {
@@ -617,15 +617,15 @@ static void SDL_Blit_XRGB8888_XBGR8888_Modulate(SDL_BlitInfo *info)
Uint32 *dst = (Uint32 *)info->dst;
int n = info->dst_w;
while (n--) {
- pixel = *src;
- R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+ pixelvalue = *src;
+ R = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); B = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (B << 16) | (G << 8) | R;
- *dst = pixel;
+ pixelvalue = (B << 16) | (G << 8) | R;
+ *dst = pixelvalue;
++src;
++dst;
}
@@ -640,7 +640,7 @@ static void SDL_Blit_XRGB8888_XBGR8888_Modulate_Scale(SDL_BlitInfo *info)
const Uint32 modulateR = info->r;
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint32 R, G, B;
Uint64 srcy, srcx;
Uint64 posy, posx;
@@ -660,15 +660,15 @@ static void SDL_Blit_XRGB8888_XBGR8888_Modulate_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+ pixelvalue = *src;
+ R = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); B = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (B << 16) | (G << 8) | R;
- *dst = pixel;
+ pixelvalue = (B << 16) | (G << 8) | R;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -873,7 +873,7 @@ static void SDL_Blit_XRGB8888_XBGR8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
static void SDL_Blit_XRGB8888_ARGB8888_Scale(SDL_BlitInfo *info)
{
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = 0xFF;
Uint64 srcy, srcx;
Uint64 posy, posx;
@@ -893,9 +893,9 @@ static void SDL_Blit_XRGB8888_ARGB8888_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- pixel |= (A << 24);
- *dst = pixel;
+ pixelvalue = *src;
+ pixelvalue |= (A << 24);
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -1037,7 +1037,7 @@ static void SDL_Blit_XRGB8888_ARGB8888_Modulate(SDL_BlitInfo *info)
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
const Uint32 modulateA = info->a;
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = (flags & SDL_COPY_MODULATE_ALPHA) ? modulateA : 0xFF;
Uint32 R, G, B;
@@ -1046,15 +1046,15 @@ static void SDL_Blit_XRGB8888_ARGB8888_Modulate(SDL_BlitInfo *info)
Uint32 *dst = (Uint32 *)info->dst;
int n = info->dst_w;
while (n--) {
- pixel = *src;
- R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+ pixelvalue = *src;
+ R = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); B = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (A << 24) | (R << 16) | (G << 8) | B;
- *dst = pixel;
+ pixelvalue = (A << 24) | (R << 16) | (G << 8) | B;
+ *dst = pixelvalue;
++src;
++dst;
}
@@ -1070,7 +1070,7 @@ static void SDL_Blit_XRGB8888_ARGB8888_Modulate_Scale(SDL_BlitInfo *info)
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
const Uint32 modulateA = info->a;
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = (flags & SDL_COPY_MODULATE_ALPHA) ? modulateA : 0xFF;
Uint32 R, G, B;
Uint64 srcy, srcx;
@@ -1091,15 +1091,15 @@ static void SDL_Blit_XRGB8888_ARGB8888_Modulate_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+ pixelvalue = *src;
+ R = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); B = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (A << 24) | (R << 16) | (G << 8) | B;
- *dst = pixel;
+ pixelvalue = (A << 24) | (R << 16) | (G << 8) | B;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -1314,7 +1314,7 @@ static void SDL_Blit_XRGB8888_ARGB8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
static void SDL_Blit_XRGB8888_ABGR8888_Scale(SDL_BlitInfo *info)
{
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = 0xFF;
Uint32 R, G, B;
Uint64 srcy, srcx;
@@ -1335,10 +1335,10 @@ static void SDL_Blit_XRGB8888_ABGR8888_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
- pixel = (A << 24) | (B << 16) | (G << 8) | R;
- *dst = pixel;
+ pixelvalue = *src;
+ R = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); B = (Uint8)pixelvalue;
+ pixelvalue = (A << 24) | (B << 16) | (G << 8) | R;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -1480,7 +1480,7 @@ static void SDL_Blit_XRGB8888_ABGR8888_Modulate(SDL_BlitInfo *info)
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
const Uint32 modulateA = info->a;
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = (flags & SDL_COPY_MODULATE_ALPHA) ? modulateA : 0xFF;
Uint32 R, G, B;
@@ -1489,15 +1489,15 @@ static void SDL_Blit_XRGB8888_ABGR8888_Modulate(SDL_BlitInfo *info)
Uint32 *dst = (Uint32 *)info->dst;
int n = info->dst_w;
while (n--) {
- pixel = *src;
- R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+ pixelvalue = *src;
+ R = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); B = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (A << 24) | (B << 16) | (G << 8) | R;
- *dst = pixel;
+ pixelvalue = (A << 24) | (B << 16) | (G << 8) | R;
+ *dst = pixelvalue;
++src;
++dst;
}
@@ -1513,7 +1513,7 @@ static void SDL_Blit_XRGB8888_ABGR8888_Modulate_Scale(SDL_BlitInfo *info)
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
const Uint32 modulateA = info->a;
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = (flags & SDL_COPY_MODULATE_ALPHA) ? modulateA : 0xFF;
Uint32 R, G, B;
Uint64 srcy, srcx;
@@ -1534,15 +1534,15 @@ static void SDL_Blit_XRGB8888_ABGR8888_Modulate_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+ pixelvalue = *src;
+ R = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); B = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (A << 24) | (B << 16) | (G << 8) | R;
- *dst = pixel;
+ pixelvalue = (A << 24) | (B << 16) | (G << 8) | R;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -1757,7 +1757,7 @@ static void SDL_Blit_XRGB8888_ABGR8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
static void SDL_Blit_XBGR8888_XRGB8888_Scale(SDL_BlitInfo *info)
{
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint32 R, G, B;
Uint64 srcy, srcx;
Uint64 posy, posx;
@@ -1777,10 +1777,10 @@ static void SDL_Blit_XBGR8888_XRGB8888_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
- pixel = (R << 16) | (G << 8) | B;
- *dst = pixel;
+ pixelvalue = *src;
+ B = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); R = (Uint8)pixelvalue;
+ pixelvalue = (R << 16) | (G << 8) | B;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -1917,7 +1917,7 @@ static void SDL_Blit_XBGR8888_XRGB8888_Modulate(SDL_BlitInfo *info)
const Uint32 modulateR = info->r;
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint32 R, G, B;
while (info->dst_h--) {
@@ -1925,15 +1925,15 @@ static void SDL_Blit_XBGR8888_XRGB8888_Modulate(SDL_BlitInfo *info)
Uint32 *dst = (Uint32 *)info->dst;
int n = info->dst_w;
while (n--) {
- pixel = *src;
- B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+ pixelvalue = *src;
+ B = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); R = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (R << 16) | (G << 8) | B;
- *dst = pixel;
+ pixelvalue = (R << 16) | (G << 8) | B;
+ *dst = pixelvalue;
++src;
++dst;
}
@@ -1948,7 +1948,7 @@ static void SDL_Blit_XBGR8888_XRGB8888_Modulate_Scale(SDL_BlitInfo *info)
const Uint32 modulateR = info->r;
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint32 R, G, B;
Uint64 srcy, srcx;
Uint64 posy, posx;
@@ -1968,15 +1968,15 @@ static void SDL_Blit_XBGR8888_XRGB8888_Modulate_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+ pixelvalue = *src;
+ B = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); R = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (R << 16) | (G << 8) | B;
- *dst = pixel;
+ pixelvalue = (R << 16) | (G << 8) | B;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -2336,7 +2336,7 @@ static void SDL_Blit_XBGR8888_XBGR8888_Modulate(SDL_BlitInfo *info)
const Uint32 modulateR = info->r;
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint32 R, G, B;
while (info->dst_h--) {
@@ -2344,15 +2344,15 @@ static void SDL_Blit_XBGR8888_XBGR8888_Modulate(SDL_BlitInfo *info)
Uint32 *dst = (Uint32 *)info->dst;
int n = info->dst_w;
while (n--) {
- pixel = *src;
- B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+ pixelvalue = *src;
+ B = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); R = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (B << 16) | (G << 8) | R;
- *dst = pixel;
+ pixelvalue = (B << 16) | (G << 8) | R;
+ *dst = pixelvalue;
++src;
++dst;
}
@@ -2367,7 +2367,7 @@ static void SDL_Blit_XBGR8888_XBGR8888_Modulate_Scale(SDL_BlitInfo *info)
const Uint32 modulateR = info->r;
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint32 R, G, B;
Uint64 srcy, srcx;
Uint64 posy, posx;
@@ -2387,15 +2387,15 @@ static void SDL_Blit_XBGR8888_XBGR8888_Modulate_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+ pixelvalue = *src;
+ B = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); R = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (B << 16) | (G << 8) | R;
- *dst = pixel;
+ pixelvalue = (B << 16) | (G << 8) | R;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -2600,7 +2600,7 @@ static void SDL_Blit_XBGR8888_XBGR8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
static void SDL_Blit_XBGR8888_ARGB8888_Scale(SDL_BlitInfo *info)
{
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = 0xFF;
Uint32 R, G, B;
Uint64 srcy, srcx;
@@ -2621,10 +2621,10 @@ static void SDL_Blit_XBGR8888_ARGB8888_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
- pixel = (A << 24) | (R << 16) | (G << 8) | B;
- *dst = pixel;
+ pixelvalue = *src;
+ B = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); R = (Uint8)pixelvalue;
+ pixelvalue = (A << 24) | (R << 16) | (G << 8) | B;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -2766,7 +2766,7 @@ static void SDL_Blit_XBGR8888_ARGB8888_Modulate(SDL_BlitInfo *info)
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
const Uint32 modulateA = info->a;
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = (flags & SDL_COPY_MODULATE_ALPHA) ? modulateA : 0xFF;
Uint32 R, G, B;
@@ -2775,15 +2775,15 @@ static void SDL_Blit_XBGR8888_ARGB8888_Modulate(SDL_BlitInfo *info)
Uint32 *dst = (Uint32 *)info->dst;
int n = info->dst_w;
while (n--) {
- pixel = *src;
- B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+ pixelvalue = *src;
+ B = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); R = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (A << 24) | (R << 16) | (G << 8) | B;
- *dst = pixel;
+ pixelvalue = (A << 24) | (R << 16) | (G << 8) | B;
+ *dst = pixelvalue;
++src;
++dst;
}
@@ -2799,7 +2799,7 @@ static void SDL_Blit_XBGR8888_ARGB8888_Modulate_Scale(SDL_BlitInfo *info)
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
const Uint32 modulateA = info->a;
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = (flags & SDL_COPY_MODULATE_ALPHA) ? modulateA : 0xFF;
Uint32 R, G, B;
Uint64 srcy, srcx;
@@ -2820,15 +2820,15 @@ static void SDL_Blit_XBGR8888_ARGB8888_Modulate_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+ pixelvalue = *src;
+ B = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); R = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (A << 24) | (R << 16) | (G << 8) | B;
- *dst = pixel;
+ pixelvalue = (A << 24) | (R << 16) | (G << 8) | B;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -3043,7 +3043,7 @@ static void SDL_Blit_XBGR8888_ARGB8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
static void SDL_Blit_XBGR8888_ABGR8888_Scale(SDL_BlitInfo *info)
{
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = 0xFF;
Uint64 srcy, srcx;
Uint64 posy, posx;
@@ -3063,9 +3063,9 @@ static void SDL_Blit_XBGR8888_ABGR8888_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- pixel |= (A << 24);
- *dst = pixel;
+ pixelvalue = *src;
+ pixelvalue |= (A << 24);
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -3207,7 +3207,7 @@ static void SDL_Blit_XBGR8888_ABGR8888_Modulate(SDL_BlitInfo *info)
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
const Uint32 modulateA = info->a;
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = (flags & SDL_COPY_MODULATE_ALPHA) ? modulateA : 0xFF;
Uint32 R, G, B;
@@ -3216,15 +3216,15 @@ static void SDL_Blit_XBGR8888_ABGR8888_Modulate(SDL_BlitInfo *info)
Uint32 *dst = (Uint32 *)info->dst;
int n = info->dst_w;
while (n--) {
- pixel = *src;
- B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+ pixelvalue = *src;
+ B = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); R = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (A << 24) | (B << 16) | (G << 8) | R;
- *dst = pixel;
+ pixelvalue = (A << 24) | (B << 16) | (G << 8) | R;
+ *dst = pixelvalue;
++src;
++dst;
}
@@ -3240,7 +3240,7 @@ static void SDL_Blit_XBGR8888_ABGR8888_Modulate_Scale(SDL_BlitInfo *info)
const Uint32 modulateG = info->g;
const Uint32 modulateB = info->b;
const Uint32 modulateA = info->a;
- Uint32 pixel;
+ Uint32 pixelvalue;
const Uint32 A = (flags & SDL_COPY_MODULATE_ALPHA) ? modulateA : 0xFF;
Uint32 R, G, B;
Uint64 srcy, srcx;
@@ -3261,15 +3261,15 @@ static void SDL_Blit_XBGR8888_ABGR8888_Modulate_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
- pixel = *src;
- B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+ pixelvalue = *src;
+ B = (Uint8)(pixelvalue >> 16); G = (Uint8)(pixelvalue >> 8); R = (Uint8)pixelvalue;
if (flags & SDL_COPY_MODULATE_COLOR) {
MULT_DIV_255(R, modulateR, R);
MULT_DIV_255(G, modulateG, G);
MULT_DIV_255(B, modulateB, B);
}
- pixel = (A << 24) | (B << 16) | (G << 8) | R;
- *dst = pixel;
+ pixelvalue = (A << 24) | (B << 16) | (G << 8) | R;
+ *dst = pixelvalue;
posx += incx;
++dst;
}
@@ -3484,7 +3484,7 @@ static void SDL_Blit_XBGR8888_ABGR8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
static void SDL_Blit_ARGB8888_XRGB8888_Scale(SDL_BlitInfo *info)
{
- Uint32 pixel;
+ Uint32 pixelvalue;
Uint64 srcy, srcx;
Uint64 posy, posx;
Uint64 incy, incx;
@@ -3503,9 +3503,9 @@ static void SDL_Blit_ARGB8888_XRGB8888_Scale(SDL_BlitInfo *info)
while (n--) {
srcx = posx >> 16;
src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
-
(Patch may be truncated, please check the link at the top of this post.)