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

(RPNG) Use image process codes

Browse Source
This commit is contained in:
twinaphex 2016-05-18 17:18:36 +02:00
parent 5050ccf519
commit e21a655dc6
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libretro-common/formats/png/rpng.c
View File

@ -30,6 +30,7 @@
#endif #endif
#include <boolean.h> #include <boolean.h>
#include <formats/image.h>
#include <formats/rpng.h> #include <formats/rpng.h>
#include <file/archive_file.h> #include <file/archive_file.h>
@ -127,14 +128,6 @@ struct rpng
uint32_t palette[256]; uint32_t palette[256];
}; };
enum png_process_code
{
PNG_PROCESS_ERROR = -2,
PNG_PROCESS_ERROR_END = -1,
PNG_PROCESS_NEXT = 0,
PNG_PROCESS_END = 1
};
static INLINE uint32_t dword_be(const uint8_t *buf) static INLINE uint32_t dword_be(const uint8_t *buf)
{ {
return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | (buf[3] << 0); return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | (buf[3] << 0);
@ -539,7 +532,7 @@ static int png_reverse_filter_copy_line(uint32_t *data, const struct png_ihdr *i
break; break;
default: default:
return PNG_PROCESS_ERROR_END; return IMAGE_PROCESS_ERROR_END;
} }
switch (ihdr->color_type) switch (ihdr->color_type)
@ -565,13 +558,13 @@ static int png_reverse_filter_copy_line(uint32_t *data, const struct png_ihdr *i
memcpy(pngp->prev_scanline, pngp->decoded_scanline, pngp->pitch); memcpy(pngp->prev_scanline, pngp->decoded_scanline, pngp->pitch);
return PNG_PROCESS_NEXT; return IMAGE_PROCESS_NEXT;
} }
static int png_reverse_filter_regular_iterate(uint32_t **data, const struct png_ihdr *ihdr, static int png_reverse_filter_regular_iterate(uint32_t **data, const struct png_ihdr *ihdr,
struct rpng_process_t *pngp) struct rpng_process_t *pngp)
{ {
int ret = PNG_PROCESS_END; int ret = IMAGE_PROCESS_END;
if (pngp->h < ihdr->height) if (pngp->h < ihdr->height)
{ {
@ -581,7 +574,7 @@ static int png_reverse_filter_regular_iterate(uint32_t **data, const struct png_
ihdr, pngp, filter); ihdr, pngp, filter);
} }
if (ret == PNG_PROCESS_END || ret == PNG_PROCESS_ERROR_END) if (ret == IMAGE_PROCESS_END || ret == IMAGE_PROCESS_ERROR_END)
goto end; goto end;
pngp->h++; pngp->h++;
@ -591,7 +584,7 @@ static int png_reverse_filter_regular_iterate(uint32_t **data, const struct png_
*data += ihdr->width; *data += ihdr->width;
pngp->data_restore_buf_size += ihdr->width; pngp->data_restore_buf_size += ihdr->width;
return PNG_PROCESS_NEXT; return IMAGE_PROCESS_NEXT;
end: end:
png_reverse_filter_deinit(pngp); png_reverse_filter_deinit(pngp);
@ -611,25 +604,25 @@ static int png_reverse_filter_adam7_iterate(uint32_t **data_,
uint32_t *data = *data_; uint32_t *data = *data_;
if (!to_next) if (!to_next)
return PNG_PROCESS_END; return IMAGE_PROCESS_END;
ret = png_reverse_filter_init(ihdr, pngp); ret = png_reverse_filter_init(ihdr, pngp);
if (ret == 1) if (ret == 1)
return PNG_PROCESS_NEXT; return IMAGE_PROCESS_NEXT;
if (ret == -1) if (ret == -1)
return PNG_PROCESS_ERROR_END; return IMAGE_PROCESS_ERROR_END;
if (png_reverse_filter_init(&pngp->ihdr, pngp) == -1) if (png_reverse_filter_init(&pngp->ihdr, pngp) == -1)
return PNG_PROCESS_ERROR; return IMAGE_PROCESS_ERROR;
do{ do{
ret = png_reverse_filter_regular_iterate(&pngp->data, ret = png_reverse_filter_regular_iterate(&pngp->data,
&pngp->ihdr, pngp); &pngp->ihdr, pngp);
}while(ret == PNG_PROCESS_NEXT); }while(ret == IMAGE_PROCESS_NEXT);
if (ret == PNG_PROCESS_ERROR || ret == PNG_PROCESS_ERROR_END) if (ret == IMAGE_PROCESS_ERROR || ret == IMAGE_PROCESS_ERROR_END)
return PNG_PROCESS_ERROR; return IMAGE_PROCESS_ERROR;
pngp->inflate_buf += pngp->pass.size; pngp->inflate_buf += pngp->pass.size;
pngp->adam7_restore_buf_size += pngp->pass.size; pngp->adam7_restore_buf_size += pngp->pass.size;
@ -646,7 +639,7 @@ static int png_reverse_filter_adam7_iterate(uint32_t **data_,
pngp->pass.size = 0; pngp->pass.size = 0;
pngp->adam7_pass_initialized = false; pngp->adam7_pass_initialized = false;
return PNG_PROCESS_NEXT; return IMAGE_PROCESS_NEXT;
} }
static int png_reverse_filter_adam7(uint32_t **data_, static int png_reverse_filter_adam7(uint32_t **data_,
@ -658,13 +651,13 @@ static int png_reverse_filter_adam7(uint32_t **data_,
switch (ret) switch (ret)
{ {
case PNG_PROCESS_ERROR_END: case IMAGE_PROCESS_ERROR_END:
case PNG_PROCESS_END: case IMAGE_PROCESS_END:
break; break;
case PNG_PROCESS_NEXT: case IMAGE_PROCESS_NEXT:
pngp->pass.pos++; pngp->pass.pos++;
return 0; return 0;
case PNG_PROCESS_ERROR: case IMAGE_PROCESS_ERROR:
if (pngp->data) if (pngp->data)
free(pngp->data); free(pngp->data);
pngp->inflate_buf -= pngp->adam7_restore_buf_size; pngp->inflate_buf -= pngp->adam7_restore_buf_size;
@ -956,7 +949,7 @@ int rpng_process_image(rpng_t *rpng,
if (!rpng_load_image_argb_process_init(rpng, data, width, if (!rpng_load_image_argb_process_init(rpng, data, width,
height)) height))
return PNG_PROCESS_ERROR; return IMAGE_PROCESS_ERROR;
return 0; return 0;
} }
@ -964,7 +957,7 @@ int rpng_process_image(rpng_t *rpng,
{ {
if (rpng_load_image_argb_process_inflate_init(rpng, data, if (rpng_load_image_argb_process_inflate_init(rpng, data,
width, height) == -1) width, height) == -1)
return PNG_PROCESS_ERROR; return IMAGE_PROCESS_ERROR;
return 0; return 0;
} }