Merge pull request #3031 from sronsse/fixes_for_team
rjpeg: Fix invalid read/writes during JPEG RGBA to ARGB conversion
This commit is contained in:
commit
a27849cbfa
|
@ -2529,7 +2529,7 @@ int rjpeg_process_image(rjpeg_t *rjpeg, void **buf_data,
|
||||||
*buf_data = pixels;
|
*buf_data = pixels;
|
||||||
|
|
||||||
/* Convert RGBA to ARGB */
|
/* Convert RGBA to ARGB */
|
||||||
do
|
while (size_tex--)
|
||||||
{
|
{
|
||||||
unsigned int texel = img[size_tex];
|
unsigned int texel = img[size_tex];
|
||||||
unsigned int A = texel & 0xFF000000;
|
unsigned int A = texel & 0xFF000000;
|
||||||
|
@ -2537,7 +2537,7 @@ int rjpeg_process_image(rjpeg_t *rjpeg, void **buf_data,
|
||||||
unsigned int G = texel & 0x0000FF00;
|
unsigned int G = texel & 0x0000FF00;
|
||||||
unsigned int R = texel & 0x000000FF;
|
unsigned int R = texel & 0x000000FF;
|
||||||
((unsigned int*)pixels)[size_tex] = A | (R << 16) | G | (B >> 16);
|
((unsigned int*)pixels)[size_tex] = A | (R << 16) | G | (B >> 16);
|
||||||
}while(size_tex--);
|
};
|
||||||
|
|
||||||
free(img);
|
free(img);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue