From 4429819ee778b2baad65c6c9c3c1c63398b9a895 Mon Sep 17 00:00:00 2001 From: unknown <rj150@hotmail.com> Date: Thu, 19 Feb 2015 16:24:03 -0500 Subject: [PATCH 1/2] removed unused `path` parameter to `rpng_load_image_argb` We already have a pointer to FILE of an opened file stream, so why would we need a file path string for loading one if we already had one loaded supplied to this func? --- libretro-common/formats/png/rpng.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng.c index 4edd616acb..34865ff9ee 100644 --- a/libretro-common/formats/png/rpng.c +++ b/libretro-common/formats/png/rpng.c @@ -769,7 +769,7 @@ bool rpng_load_image_argb_process(uint8_t *inflate_buf, } bool rpng_load_image_argb_init(FILE *file, - const char *path, uint32_t **data, + uint32_t **data, unsigned *width, unsigned *height, long *file_len) { @@ -813,8 +813,7 @@ bool rpng_load_image_argb(const char *path, uint32_t **data, GOTO_END_ERROR(); } - if (!rpng_load_image_argb_init(file, path, - data, width, height, &file_len)) + if (!rpng_load_image_argb_init(file, data, width, height, &file_len)) GOTO_END_ERROR(); /* feof() apparently isn't triggered after a seek (IEND). */ From 429eb3d1d5cccfe2de5383021d8476e693d9b1aa Mon Sep 17 00:00:00 2001 From: unknown <rj150@hotmail.com> Date: Thu, 19 Feb 2015 16:24:28 -0500 Subject: [PATCH 2/2] `bool rpng_load_image_argb_init` should be a static function. --- libretro-common/formats/png/rpng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng.c index 34865ff9ee..94c2b5eea0 100644 --- a/libretro-common/formats/png/rpng.c +++ b/libretro-common/formats/png/rpng.c @@ -768,7 +768,7 @@ bool rpng_load_image_argb_process(uint8_t *inflate_buf, return true; } -bool rpng_load_image_argb_init(FILE *file, +static bool rpng_load_image_argb_init(FILE *file, uint32_t **data, unsigned *width, unsigned *height, long *file_len)