mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 03:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor rpng_image_load_tga_shift

Browse Source
This commit is contained in:
twinaphex 2015-01-26 18:41:33 +01:00
parent fc8f2662a1
commit b04b1d2506
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gfx/image/image_rpng.c
View File

@ -32,7 +32,7 @@ static bool rpng_image_load_tga_shift(const char *path,
unsigned a_shift, unsigned r_shift, unsigned a_shift, unsigned r_shift,
unsigned g_shift, unsigned b_shift) unsigned g_shift, unsigned b_shift)
{ {
unsigned i, bits, size; unsigned i, bits, size, bits_mul;
uint8_t info[6], *buf; uint8_t info[6], *buf;
unsigned width = 0; unsigned width = 0;
unsigned height = 0; unsigned height = 0;
@ -75,35 +75,10 @@ static bool rpng_image_load_tga_shift(const char *path,
return false; return false;
} }
tmp = buf + 18; tmp = buf + 18;
bits_mul = 3;
if (bits == 32) if (bits != 32 || bits != 24)
{
for (i = 0; i < width * height; i++)
{
uint32_t b = tmp[i * 4 + 0];
uint32_t g = tmp[i * 4 + 1];
uint32_t r = tmp[i * 4 + 2];
uint32_t a = tmp[i * 4 + 3];
out_img->pixels[i] = (a << a_shift) |
(r << r_shift) | (g << g_shift) | (b << b_shift);
}
}
else if (bits == 24)
{
for (i = 0; i < width * height; i++)
{
uint32_t b = tmp[i * 3 + 0];
uint32_t g = tmp[i * 3 + 1];
uint32_t r = tmp[i * 3 + 2];
uint32_t a = 0xff;
out_img->pixels[i] = (a << a_shift) |
(r << r_shift) | (g << g_shift) | (b << b_shift);
}
}
else
{ {
RARCH_ERR("Bit depth of TGA image is wrong. Only 32-bit and 24-bit supported.\n"); RARCH_ERR("Bit depth of TGA image is wrong. Only 32-bit and 24-bit supported.\n");
free(buf); free(buf);
@ -112,6 +87,23 @@ static bool rpng_image_load_tga_shift(const char *path,
return false; return false;
} }
if (bits == 32)
bits_mul = 4;
for (i = 0; i < width * height; i++)
{
uint32_t b = tmp[i * bits_mul + 0];
uint32_t g = tmp[i * bits_mul + 1];
uint32_t r = tmp[i * bits_mul + 2];
uint32_t a = tmp[i * bits_mul + 3];
if (bits == 24)
a = 0xff;
out_img->pixels[i] = (a << a_shift) |
(r << r_shift) | (g << g_shift) | (b << b_shift);
}
free(buf); free(buf);
return true; return true;
} }