1 files changed, 28 insertions, 63 deletions

diff --git a/thirdparty/thorvg/src/loaders/png/tvgPngLoader.cpp b/thirdparty/thorvg/src/loaders/png/tvgPngLoader.cpp
index 32ff57c5c3..111180b657 100644
--- a/thirdparty/thorvg/src/loaders/png/tvgPngLoader.cpp
+++ b/thirdparty/thorvg/src/loaders/png/tvgPngLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2023 the ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,14 +29,22 @@
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
-void PngLoader::clear()
+
+void PngLoader::run(unsigned tid)
 {
-    lodepng_state_cleanup(&state);
+    auto width = static_cast<unsigned>(w);
+    auto height = static_cast<unsigned>(h);
 
-    if (freeData) free(data);
-    data = nullptr;
-    size = 0;
-    freeData = false;
+    if (lodepng_decode(&surface.buf8, &width, &height, &state, data, size)) {
+        TVGERR("PNG", "Failed to decode image");
+    }
+
+    //setup the surface
+    surface.stride = width;
+    surface.w = width;
+    surface.h = height;
+    surface.channelSize = sizeof(uint32_t);
+    surface.premultiplied = false;
 }
 
 
@@ -44,7 +52,7 @@ void PngLoader::clear()
 /* External Class Implementation                                        */
 /************************************************************************/
 
-PngLoader::PngLoader()
+PngLoader::PngLoader() : ImageLoader(FileType::Png)
 {
     lodepng_state_init(&state);
 }
@@ -53,14 +61,13 @@ PngLoader::PngLoader()
 PngLoader::~PngLoader()
 {
     if (freeData) free(data);
-    free(image);
+    free(surface.buf8);
+    lodepng_state_cleanup(&state);
 }
 
 
 bool PngLoader::open(const string& path)
 {
-    clear();
-
     auto pngFile = fopen(path.c_str(), "rb");
     if (!pngFile) return false;
 
@@ -76,26 +83,23 @@ bool PngLoader::open(const string& path)
 
     freeData = true;
 
-    if (fread(data, size, 1, pngFile) < 1) goto failure;
+    if (fread(data, size, 1, pngFile) < 1) goto finalize;
 
     lodepng_state_init(&state);
 
     unsigned int width, height;
-    if (lodepng_inspect(&width, &height, &state, data, size) > 0) goto failure;
+    if (lodepng_inspect(&width, &height, &state, data, size) > 0) goto finalize;
 
     w = static_cast<float>(width);
     h = static_cast<float>(height);
 
-    if (state.info_png.color.colortype == LCT_RGBA) cs = ColorSpace::ABGR8888;
-    else cs = ColorSpace::ARGB8888;
+    if (state.info_png.color.colortype == LCT_RGBA) surface.cs = ColorSpace::ABGR8888;
+    else surface.cs = ColorSpace::ARGB8888;
 
     ret = true;
 
     goto finalize;
 
-failure:
-    clear();
-
 finalize:
     fclose(pngFile);
     return ret;
@@ -104,10 +108,6 @@ finalize:
 
 bool PngLoader::open(const char* data, uint32_t size, bool copy)
 {
-    clear();
-
-    lodepng_state_init(&state);
-
     unsigned int width, height;
     if (lodepng_inspect(&width, &height, &state, (unsigned char*)(data), size) > 0) return false;
 
@@ -125,7 +125,7 @@ bool PngLoader::open(const char* data, uint32_t size, bool copy)
     h = static_cast<float>(height);
     this->size = size;
 
-    cs = ColorSpace::ABGR8888;
+    surface.cs = ColorSpace::ABGR8888;
 
     return true;
 }
@@ -133,53 +133,18 @@ bool PngLoader::open(const char* data, uint32_t size, bool copy)
 
 bool PngLoader::read()
 {
-    if (!data || w <= 0 || h <= 0) return false;
-
-    TaskScheduler::request(this);
+    if (!data || w == 0 || h == 0) return false;
 
-    return true;
-}
+    if (!LoadModule::read()) return true;
 
+    TaskScheduler::request(this);
 
-bool PngLoader::close()
-{
-    this->done();
-    clear();
     return true;
 }
 
 
-unique_ptr<Surface> PngLoader::bitmap()
+Surface* PngLoader::bitmap()
 {
     this->done();
-
-    if (!image) return nullptr;
-
-    //TODO: It's better to keep this surface instance in the loader side
-    auto surface = new Surface;
-    surface->buf8 = image;
-    surface->stride = static_cast<uint32_t>(w);
-    surface->w = static_cast<uint32_t>(w);
-    surface->h = static_cast<uint32_t>(h);
-    surface->cs = cs;
-    surface->channelSize = sizeof(uint32_t);
-    surface->premultiplied = false;
-    surface->owner = true;
-
-    return unique_ptr<Surface>(surface);
-}
-
-
-void PngLoader::run(unsigned tid)
-{
-    if (image) {
-        free(image);
-        image = nullptr;
-    }
-    auto width = static_cast<unsigned>(w);
-    auto height = static_cast<unsigned>(h);
-
-    if (lodepng_decode(&image, &width, &height, &state, data, size)) {
-        TVGERR("PNG", "Failed to decode image");
-    }
+    return ImageLoader::bitmap();
 }