From f8e99403a481f11ba3003eae92805839c8f9f948 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 14 May 2016 00:48:40 +0200
Subject: [PATCH] Cleanups

---
 libretro-common/formats/png/test/rpng_test.c |  8 ++---
 tasks/task_image.c                           | 31 ++++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/libretro-common/formats/png/test/rpng_test.c b/libretro-common/formats/png/test/rpng_test.c
index 57d37df356..0cb86e8a19 100644
--- a/libretro-common/formats/png/test/rpng_test.c
+++ b/libretro-common/formats/png/test/rpng_test.c
@@ -71,13 +71,13 @@ static bool rpng_load_image_argb(const char *path, uint32_t **data,
       goto end;
    }
 
-   if (!rpng_nbio_load_image_argb_start(rpng))
+   if (!rpng_start(rpng))
    {
       ret = false;
       goto end;
    }
 
-   while (rpng_nbio_load_image_argb_iterate(rpng));
+   while (rpng_iterate_image(rpng));
 
    if (!rpng_is_valid(rpng))
    {
@@ -87,7 +87,7 @@ static bool rpng_load_image_argb(const char *path, uint32_t **data,
    
    do
    {
-      retval = rpng_nbio_load_image_argb_process(rpng, data, width, height);
+      retval = rpng_process_image(rpng, (void**)data, width, height);
    }while(retval == IMAGE_PROCESS_NEXT);
 
    if (retval == IMAGE_PROCESS_ERROR || retval == IMAGE_PROCESS_ERROR_END)
@@ -97,7 +97,7 @@ end:
    if (handle)
       nbio_free(handle);
    if (rpng)
-      rpng_nbio_load_image_free(rpng);
+      rpng_free(rpng);
    rpng = NULL;
    if (!ret)
       free(*data);
diff --git a/tasks/task_image.c b/tasks/task_image.c
index 26231706ad..c588f3486e 100644
--- a/tasks/task_image.c
+++ b/tasks/task_image.c
@@ -218,14 +218,13 @@ static void rarch_task_image_load_free_internal(nbio_handle_t *nbio)
 {
    nbio_image_handle_t *image = nbio ? nbio->image : NULL;
 
-   if (nbio->image)
-      free(nbio->image);
+   if (image)
+      free(image);
 
    nbio->image                   = NULL;
 
    image_transfer_free(image->handle, nbio->image_type);
 
-
    image->handle                 = NULL;
    image->cb                     = NULL;
 }
@@ -318,13 +317,13 @@ bool rarch_task_image_load_handler(retro_task_t *task)
    }
 
    if (     nbio->is_finished 
-         && nbio->image->is_finished 
+         && image->is_finished 
          && !task->cancelled)
    {
-      task->task_data = malloc(sizeof(nbio->image->ti));
+      task->task_data = malloc(sizeof(image->ti));
 
       if (task->task_data)
-         memcpy(task->task_data, &nbio->image->ti, sizeof(nbio->image->ti));
+         memcpy(task->task_data, &image->ti, sizeof(image->ti));
 
       return false;
    }
@@ -335,10 +334,11 @@ bool rarch_task_image_load_handler(retro_task_t *task)
 bool rarch_task_push_image_load(const char *fullpath,
       const char *type, retro_task_callback_t cb, void *user_data)
 {
-   nbio_handle_t *nbio   = NULL;
-   retro_task_t *t       = NULL;
-   uint32_t cb_type_hash = djb2_calculate(type);
-   struct nbio_t *handle = nbio_open(fullpath, NBIO_READ);
+   nbio_handle_t             *nbio   = NULL;
+   retro_task_t             *t       = NULL;
+   uint32_t             cb_type_hash = djb2_calculate(type);
+   struct nbio_t             *handle = nbio_open(fullpath, NBIO_READ);
+   nbio_image_handle_t        *image = NULL;
 
    if (!handle)
       goto error;
@@ -348,12 +348,17 @@ bool rarch_task_push_image_load(const char *fullpath,
    if (!nbio)
       goto error;
 
-   nbio->image        = (struct nbio_image_handle*)calloc(1, sizeof(*nbio->image));
+   image              = (nbio_image_handle_t*)calloc(1, sizeof(*image));
+   
+   if (!image)
+      goto error;
+
+   nbio->image        = image;
    nbio->handle       = handle;
    nbio->is_finished  = false;
    nbio->cb           = &cb_nbio_default;
    nbio->status       = NBIO_STATUS_TRANSFER;
-   nbio->image->status = IMAGE_STATUS_TRANSFER;
+   image->status      = IMAGE_STATUS_TRANSFER;
 
    if (strstr(fullpath, ".png"))
       nbio->image_type = IMAGE_TYPE_PNG;
@@ -389,6 +394,8 @@ bool rarch_task_push_image_load(const char *fullpath,
 error:
    if (t)
       free(t);
+   if (nbio->image)
+      free(nbio->image);
    if (nbio)
       free(nbio);
    RARCH_ERR("[image load] Failed to open '%s': %s.\n",