mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RJPEG) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-12-18 15:30:29 +01:00
parent 099f3a8d52
commit a44afda5c5
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,23 +165,11 @@ typedef struct
uint8_t *img_buffer_original; uint8_t *img_buffer_original;
} rjpeg__context; } rjpeg__context;
static uint8_t *rjpeg__jpeg_load(rjpeg__context *s, unsigned *x, unsigned *y, int *comp, int req_comp);
#define rjpeg__err(x,y) 0 #define rjpeg__err(x,y) 0
#define rjpeg__errpf(x,y) ((float *) (rjpeg__err(x,y)?NULL:NULL)) #define rjpeg__errpf(x,y) ((float *) (rjpeg__err(x,y)?NULL:NULL))
#define rjpeg__errpuc(x,y) ((unsigned char *) (rjpeg__err(x,y)?NULL:NULL)) #define rjpeg__errpuc(x,y) ((unsigned char *) (rjpeg__err(x,y)?NULL:NULL))
static uint8_t *rjpeg_load_from_memory(const uint8_t *buffer, int len,
unsigned *x, unsigned *y, int *comp, int req_comp)
{
rjpeg__context s;
s.io.read = NULL;
s.img_buffer = (uint8_t*)buffer;
s.img_buffer_original = (uint8_t*)buffer;
s.img_buffer_end = (uint8_t*)buffer+len;
return rjpeg__jpeg_load(&s,x,y,comp,req_comp);
}
static INLINE uint8_t rjpeg__get8(rjpeg__context *s) static INLINE uint8_t rjpeg__get8(rjpeg__context *s)
{ {
@ -2524,12 +2512,20 @@ error:
return NULL; return NULL;
} }
static unsigned char *rjpeg__jpeg_load(rjpeg__context *s, static uint8_t *rjpeg_load_from_memory(const uint8_t *buffer, int len,
unsigned *x, unsigned *y, int *comp, int req_comp) unsigned *x, unsigned *y, int *comp, int req_comp)
{ {
rjpeg__jpeg j; rjpeg__jpeg j;
j.s = s; rjpeg__context s;
s.io.read = NULL;
s.img_buffer = (uint8_t*)buffer;
s.img_buffer_original = (uint8_t*)buffer;
s.img_buffer_end = (uint8_t*)buffer+len;
j.s = &s;
rjpeg__setup_jpeg(&j); rjpeg__setup_jpeg(&j);
return rjpeg_load_jpeg_image(&j, x,y,comp,req_comp); return rjpeg_load_jpeg_image(&j, x,y,comp,req_comp);
} }