From 021d8e6af8df1f1355bd1abb14f9514d00a0e2f1 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 24 Jan 2016 19:48:25 +0100
Subject: [PATCH] Make file_archive_get_default_file_backend public scope

---
 libretro-common/file/file_archive.c         | 2 +-
 libretro-common/formats/png/rpng.c          | 4 ++++
 libretro-common/include/file/file_archive.h | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libretro-common/file/file_archive.c b/libretro-common/file/file_archive.c
index 0baa944a8b..906a2bbae9 100644
--- a/libretro-common/file/file_archive.c
+++ b/libretro-common/file/file_archive.c
@@ -281,7 +281,7 @@ static int file_archive_extract_cb(const char *name, const char *valid_exts,
    return 1;
 }
 
-static const struct zlib_file_backend *file_archive_get_default_file_backend(void)
+const struct zlib_file_backend *file_archive_get_default_file_backend(void)
 {
    return &zlib_backend;
 }
diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng.c
index defa2bd1c0..813a011af0 100644
--- a/libretro-common/formats/png/rpng.c
+++ b/libretro-common/formats/png/rpng.c
@@ -112,6 +112,7 @@ struct rpng_process_t
       unsigned pos;
    } pass;
    void *stream;
+   const struct zlib_file_backend *stream_backend;
 };
 
 struct rpng
@@ -952,6 +953,9 @@ int rpng_nbio_load_image_argb_process(rpng_t *rpng,
 {
    if (!rpng->process.initialized)
    {
+      if (!rpng->process.stream_backend)
+         rpng->process.stream_backend = file_archive_get_default_file_backend();
+
       if (!rpng_load_image_argb_process_init(rpng, data, width,
                height))
          return PNG_PROCESS_ERROR;
diff --git a/libretro-common/include/file/file_archive.h b/libretro-common/include/file/file_archive.h
index b9847dc368..3030cbae4a 100644
--- a/libretro-common/include/file/file_archive.h
+++ b/libretro-common/include/file/file_archive.h
@@ -183,6 +183,8 @@ uint64_t zlib_stream_get_total_out(void *data);
 void zlib_stream_decrement_total_out(void *data,
       unsigned subtraction);
 
+const struct zlib_file_backend *file_archive_get_default_file_backend(void);
+
 const struct zlib_file_backend zlib_backend;
 
 #endif