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

Merge commit '944cac83520c99e1ddf3d8cd3bf25990c8746d14'

Browse Source
This commit is contained in:
twinaphex 2018-06-21 08:07:19 +02:00
commit 697531dbdd
4 changed files with 78 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
libretro-common/formats/bmp/rbmp.c
View File

@ -113,7 +113,10 @@ static unsigned char *rbmp__convert_format(
{
case ((1)*8+(2)):
for(i=x-1; i >= 0; --i, src += 1, dest += 2)
dest[0]=src[0], dest[1]=255;
{
dest[0]=src[0];
dest[1]=255;
}
break;
case ((1)*8+(3)):
for(i=x-1; i >= 0; --i, src += 1, dest += 3)
@ -121,7 +124,10 @@ static unsigned char *rbmp__convert_format(
break;
case ((1)*8+(4)):
for(i=x-1; i >= 0; --i, src += 1, dest += 4)
dest[0]=dest[1]=dest[2]=src[0], dest[3]=255;
{
dest[0]=dest[1]=dest[2]=src[0];
dest[3]=255;
}
break;
case ((2)*8+(1)):
for(i=x-1; i >= 0; --i, src += 2, dest += 1)
@ -133,11 +139,19 @@ static unsigned char *rbmp__convert_format(
break;
case ((2)*8+(4)):
for(i=x-1; i >= 0; --i, src += 2, dest += 4)
dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1];
{
dest[0]=dest[1]=dest[2]=src[0];
dest[3]=src[1];
}
break;
case ((3)*8+(4)):
for(i=x-1; i >= 0; --i, src += 3, dest += 4)
dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255;
{
dest[0]=src[0];
dest[1]=src[1];
dest[2]=src[2];
dest[3]=255;
}
break;
case ((3)*8+(1)):
for(i=x-1; i >= 0; --i, src += 3, dest += 1)
@ -157,7 +171,11 @@ static unsigned char *rbmp__convert_format(
break;
case ((4)*8+(3)):
for(i=x-1; i >= 0; --i, src += 4, dest += 3)
dest[0]=src[0],dest[1]=src[1],dest[2]=src[2];
{
dest[0]=src[0];
dest[1]=src[1];
dest[2]=src[2];
}
break;
default:
break;
@ -176,11 +194,31 @@ static int rbmp__high_bit(unsigned int z)
int n=0;
if (z == 0)
return -1;
if (z >= 0x10000) n += 16, z >>= 16;
if (z >= 0x00100) n += 8, z >>= 8;
if (z >= 0x00010) n += 4, z >>= 4;
if (z >= 0x00004) n += 2, z >>= 2;
if (z >= 0x00002) n += 1, z >>= 1;
if (z >= 0x10000)
{
n += 16;
z >>= 16;
}
if (z >= 0x00100)
{
n += 8;
z >>= 8;
}
if (z >= 0x00010)
{
n += 4;
z >>= 4;
}
if (z >= 0x00004)
{
n += 2;
z >>= 2;
}
if (z >= 0x00002)
{
n += 1;
z >>= 1;
}
return n;
}
@ -525,7 +563,9 @@ static unsigned char *rbmp__bmp_load(rbmp__context *s, unsigned *x, unsigned *y,
unsigned char *p2 = out + (s->img_y-1-j)*s->img_x*target;
for (i=0; i < (int) s->img_x*target; ++i)
{
t = p1[i], p1[i] = p2[i], p2[i] = t;
t = p1[i];
p1[i] = p2[i];
p2[i] = t;
}
}
}

5
libretro-common/formats/jpeg/rjpeg.c
View File

@ -2523,7 +2523,10 @@ static uint8_t *rjpeg_load_jpeg_image(rjpeg__jpeg *z,
out[i] = y[i];
else
for (i=0; i < z->s->img_x; ++i)
*out++ = y[i], *out++ = 255;
{
*out++ = y[i];
*out++ = 255;
}
}
}

18
libretro-common/formats/tga/rtga.c
View File

@ -117,7 +117,10 @@ static unsigned char *rtga__convert_format(
{
case ((1)*8+(2)):
for(i=x-1; i >= 0; --i, src += 1, dest += 2)
dest[0]=src[0], dest[1]=255;
{
dest[0]=src[0];
dest[1]=255;
}
break;
case ((1)*8+(3)):
for(i=x-1; i >= 0; --i, src += 1, dest += 3)
@ -141,7 +144,12 @@ static unsigned char *rtga__convert_format(
break;
case ((3)*8+(4)):
for(i=x-1; i >= 0; --i, src += 3, dest += 4)
dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255;
{
dest[0]=src[0];
dest[1]=src[1];
dest[2]=src[2];
dest[3]=255;
}
break;
case ((3)*8+(1)):
for(i=x-1; i >= 0; --i, src += 3, dest += 1)
@ -161,7 +169,11 @@ static unsigned char *rtga__convert_format(
break;
case ((4)*8+(3)):
for(i=x-1; i >= 0; --i, src += 4, dest += 3)
dest[0]=src[0],dest[1]=src[1],dest[2]=src[2];
{
dest[0]=src[0];
dest[1]=src[1];
dest[2]=src[2];
}
break;
default:
break;

10
libretro-common/string/stdstring.c
View File

@ -109,7 +109,10 @@ char *string_trim_whitespace_left(char *const s)
char *cur = s;
while(*cur && isspace((unsigned char)*cur))
++cur, --len;
{
++cur;
--len;
}
if(s != cur)
memmove(s, cur, len + 1);
@ -128,7 +131,10 @@ char *string_trim_whitespace_right(char *const s)
char *cur = s + len - 1;
while(cur != s && isspace((unsigned char)*cur))
--cur, --len;
{
--cur;
--len;
}
cur[isspace((unsigned char)*cur) ? 0 : 1] = '\0';
}