CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-08 19:40:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(rpng) Refactor some code

Browse Source
This commit is contained in:
twinaphex 2015-02-19 14:47:26 +01:00
parent e519e2f2bb
commit 64ebcfba2b
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,9 +618,13 @@ static bool png_append_idat(FILE *file,
buf->data = new_buffer;
if (fread(buf->data + buf->size, 1, chunk->size, file) != chunk->size)
return false;
if (fseek(file, sizeof(uint32_t), SEEK_CUR) < 0)
return true;
}
static bool file_increment_ptr(FILE *file, size_t increment_size)
{
if (fseek(file, increment_size, SEEK_CUR) < 0)
return false;
buf->size += chunk->size;
return true;
}
@ -643,9 +647,6 @@ static bool png_read_plte(FILE *file, uint32_t *buffer, unsigned entries)
buffer[i] = (r << 16) | (g << 8) | (b << 0) | (0xffu << 24);
}
if (fseek(file, sizeof(uint32_t), SEEK_CUR) < 0)
return false;
return true;
}
@ -698,7 +699,7 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
{
case PNG_CHUNK_NOOP:
default:
if (fseek(file, chunk.size + sizeof(uint32_t), SEEK_CUR) < 0)
if (!file_increment_ptr(file, chunk.size + sizeof(uint32_t)))
GOTO_END_ERROR();
break;
@ -725,6 +726,9 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
if (!png_read_plte(file, palette, chunk.size / 3))
GOTO_END_ERROR();
if (!file_increment_ptr(file, sizeof(uint32_t)))
GOTO_END_ERROR();
has_plte = true;
break;
@ -735,6 +739,11 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
if (!png_append_idat(file, &chunk, &idat_buf))
GOTO_END_ERROR();
if (!file_increment_ptr(file, sizeof(uint32_t)))
GOTO_END_ERROR();
idat_buf.size += chunk.size;
has_idat = true;
break;
@ -742,7 +751,7 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
if (!has_ihdr || !has_idat)
GOTO_END_ERROR();
if (fseek(file, sizeof(uint32_t), SEEK_CUR) < 0)
if (!file_increment_ptr(file, sizeof(uint32_t)))
GOTO_END_ERROR();
has_iend = true;