From 50da80573dd3fd3c6aa42c9ce88acb695aef20ba Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Fri, 10 Feb 2023 13:46:06 +0900 Subject: [PATCH] png_loader(static): Move the colortype check code to open() --- src/loaders/png/tvgPngLoader.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/loaders/png/tvgPngLoader.cpp b/src/loaders/png/tvgPngLoader.cpp index d4153326..2d8f78b2 100644 --- a/src/loaders/png/tvgPngLoader.cpp +++ b/src/loaders/png/tvgPngLoader.cpp @@ -125,6 +125,8 @@ bool PngLoader::open(const string& path) h = static_cast(height); ret = true; + if (state.info_png.color.colortype == LCT_RGBA) colorSpace = SwCanvas::ABGR8888; + goto finalize; failure: @@ -159,6 +161,8 @@ bool PngLoader::open(const char* data, uint32_t size, bool copy) h = static_cast(height); this->size = size; + if (state.info_png.color.colortype == LCT_RGBA) colorSpace = SwCanvas::ABGR8888; + return true; } @@ -213,7 +217,5 @@ void PngLoader::run(unsigned tid) lodepng_decode(&image, &width, &height, &state, data, size); - if (state.info_png.color.colortype == LCT_RGBA) colorSpace = SwCanvas::ABGR8888; - _premultiply((uint32_t*)(image), width, height); }