CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-13 06:10:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rjpeg_process_image should not set the texture image's width/height -

Browse Source 
that is done later
This commit is contained in:
twinaphex 2016-05-13 09:34:42 +02:00
parent 1e872108b7
commit 1512d36220
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2454,8 +2454,6 @@ int rjpeg_process_image(void *data, void **buf_data,
uint8_t **buf = (uint8_t**)buf_data;
out_img->pixels = (uint32_t*)rjpeg_load_from_memory(*buf, size, width, height, &comp, 4);
out_img->width = *width;
out_img->height = *height;
return IMAGE_PROCESS_END;
}
@ -2471,6 +2469,9 @@ bool rjpeg_image_load(uint8_t *buf, void *data, size_t size,
if (rjpeg_process_image(out_img, (void**)&buf, size, &width, &height) != IMAGE_PROCESS_END)
return false;
out_img->width = width;
out_img->height = height;
if (r_shift == 0 && b_shift == 16) { } /* RGBA, doesn't need conversion */
else
video_frame_convert_rgba_to_bgra(buf, out_img->pixels, width);