mirror/StrawberryBF
1
0
Fork 0
mirror of https://github.com/MaddyThorson/StrawberryBF.git synced 2025-04-11 03:06:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed RGBA bytes being clobbered by uint8 cast

Browse Source
This commit is contained in:
Noel Berry 2020-05-27 19:58:48 -07:00
parent 01a4f60a63
commit 1dd219ae9f
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Core/Sprite.bf
View File

@ -388,9 +388,9 @@ namespace Strawberry
{ {
for (int p = 0, int b = 0; p < len; p++, b += 4) for (int p = 0, int b = 0; p < len; p++, b += 4)
{ {
pixels[p].R = (uint8)(bytes[b + 0] * bytes[b + 3] / 255); pixels[p].R = (uint8)((int)bytes[b + 0] * (int)bytes[b + 3] / 255);
pixels[p].G = (uint8)(bytes[b + 1] * bytes[b + 3] / 255); pixels[p].G = (uint8)((int)bytes[b + 1] * (int)bytes[b + 3] / 255);
pixels[p].B = (uint8)(bytes[b + 2] * bytes[b + 3] / 255); pixels[p].B = (uint8)((int)bytes[b + 2] * (int)bytes[b + 3] / 255);
pixels[p].A = bytes[b + 3]; pixels[p].A = bytes[b + 3];
} }
} }
@ -398,7 +398,7 @@ namespace Strawberry
{ {
for (int p = 0, int b = 0; p < len; p++, b += 2) for (int p = 0, int b = 0; p < len; p++, b += 2)
{ {
pixels[p].R = pixels[p].G = pixels[p].B = (uint8)(bytes[b + 0] * bytes[b + 1] / 255); pixels[p].R = pixels[p].G = pixels[p].B = (uint8)((int)bytes[b + 0] * (int)bytes[b + 1] / 255);
pixels[p].A = bytes[b + 1]; pixels[p].A = bytes[b + 1];
} }
} }
@ -564,10 +564,10 @@ namespace Strawberry
{ {
if (src.A != 0) if (src.A != 0)
{ {
uint8 a = dest[index]; int a = dest[index];
uint8 r = dest[index + 1]; int r = dest[index + 1];
uint8 g = dest[index + 2]; int g = dest[index + 2];
uint8 b = dest[index + 3]; int b = dest[index + 3];
if (dest[index] == 0) if (dest[index] == 0)
{ {
@ -578,19 +578,19 @@ namespace Strawberry
} }
else else
{ {
var sa = MUL_UN8(src.A, opacity); int sa = MUL_UN8(src.A, opacity);
var ra = a + sa - MUL_UN8(a, sa); int ra = a + sa - MUL_UN8(a, sa);
a = (uint8)ra; a = ra;
r = (uint8)(r + (src.R - r) * sa / ra); r = (r + (src.R - r) * sa / ra);
g = (uint8)(g + (src.G - g) * sa / ra); g = (g + (src.G - g) * sa / ra);
b = (uint8)(b + (src.B - b) * sa / ra); b = (b + (src.B - b) * sa / ra);
} }
dest[index] = a; dest[index] = (uint8)a;
dest[index + 1] = r; dest[index + 1] = (uint8)r;
dest[index + 2] = g; dest[index + 2] = (uint8)g;
dest[index + 3] = b; dest[index + 3] = (uint8)b;
} }
} }
}; };