mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 01:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(rjpeg) Cleanup

Browse Source
This commit is contained in:
twinaphex 2017-04-10 06:11:53 +02:00
parent a84540515c
commit 2712b60de0
1 changed files with 11 additions and 6 deletions

17
libretro-common/formats/jpeg/rjpeg.c

@ -250,11 +250,15 @@ typedef struct
*/ */
#define RJPEG__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) #define RJPEG__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7)
#define JPEG_MARKER 0xFF
#define JPEG_MARKER_SOI 0xD8
#define JPEG_MARKER_SOS 0xDA
#define JPEG_MARKER_EOI 0xD9
#define JPEG_MARKER_APP1 0xE1
#define JPEG_MARKER_APP2 0xE2
/* use comparisons since in some cases we handle more than one case (e.g. SOF) */ /* use comparisons since in some cases we handle more than one case (e.g. SOF) */
#define rjpeg__SOI(x) ((x) == 0xd8)
#define rjpeg__EOI(x) ((x) == 0xd9)
#define rjpeg__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) #define rjpeg__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2)
#define rjpeg__SOS(x) ((x) == 0xda)
#define rjpeg__SOF_progressive(x) ((x) == 0xc2) #define rjpeg__SOF_progressive(x) ((x) == 0xc2)
#define rjpeg__div4(x) ((uint8_t) ((x) >> 2)) #define rjpeg__div4(x) ((uint8_t) ((x) >> 2))
@ -1331,6 +1335,7 @@ static int rjpeg__parse_entropy_coded_data(rjpeg__jpeg *z)
for (i=0; i < w; ++i) for (i=0; i < w; ++i)
{ {
short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
if (z->spec_start == 0) if (z->spec_start == 0)
{ {
if (!rjpeg__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) if (!rjpeg__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
@ -1869,7 +1874,7 @@ static int rjpeg__decode_jpeg_header(rjpeg__jpeg *z, int scan)
m = rjpeg__get_marker(z); m = rjpeg__get_marker(z);
/* No SOI. Corrupt JPEG? */ /* No SOI. Corrupt JPEG? */
if (!rjpeg__SOI(m)) if (m != JPEG_MARKER_SOI)
return 0; return 0;
if (scan == RJPEG_SCAN_TYPE) if (scan == RJPEG_SCAN_TYPE)
@ -1912,9 +1917,9 @@ static int rjpeg__decode_jpeg_image(rjpeg__jpeg *j)
return 0; return 0;
m = rjpeg__get_marker(j); m = rjpeg__get_marker(j);
while (!rjpeg__EOI(m)) while (m != JPEG_MARKER_EOI)
{ {
if (rjpeg__SOS(m)) if (m == JPEG_MARKER_SOS)
{ {
if (!rjpeg__process_scan_header(j)) if (!rjpeg__process_scan_header(j))
return 0; return 0;