From 141a417e11da29010ca7a74c981c02f5663d35df Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 25 Feb 2015 21:54:24 +0100 Subject: [PATCH] Revert "Create png_reverse_filter_deinit" This reverts commit ef09b9a855438bf5669322a7f104a2050265b4c5. --- libretro-common/formats/png/rpng_decode_common.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libretro-common/formats/png/rpng_decode_common.h b/libretro-common/formats/png/rpng_decode_common.h index a3ac0bfbac..fd0e116711 100644 --- a/libretro-common/formats/png/rpng_decode_common.h +++ b/libretro-common/formats/png/rpng_decode_common.h @@ -89,14 +89,6 @@ static void deinterlace_pass(uint32_t *data, const struct png_ihdr *ihdr, } } -static void png_reverse_filter_deinit(struct rpng_process_t *pngp) -{ - if (pngp->decoded_scanline) - free(pngp->decoded_scanline); - if (pngp->prev_scanline) - free(pngp->prev_scanline); -} - static bool png_reverse_filter_init(uint32_t *data, const struct png_ihdr *ihdr, struct rpng_process_t *pngp) { @@ -113,7 +105,8 @@ static bool png_reverse_filter_init(uint32_t *data, const struct png_ihdr *ihdr, if (!pngp->prev_scanline || !pngp->decoded_scanline) { - png_reverse_filter_deinit(pngp); + free(pngp->decoded_scanline); + free(pngp->prev_scanline); return false; } @@ -193,7 +186,10 @@ static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr, } end: - png_reverse_filter_deinit(pngp); + if (pngp->decoded_scanline) + free(pngp->decoded_scanline); + if (pngp->prev_scanline) + free(pngp->prev_scanline); return ret; }