From 55c08497463be86518191e64c83512a73cd1b8fd Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 10 Apr 2025 12:57:07 +0900 Subject: [PATCH] loaders: explicit variable scope to improve portability issue: https://github.com/godotengine/godot/pull/105093 --- src/loaders/external_jpg/tvgJpgLoader.cpp | 2 +- src/loaders/external_png/tvgPngLoader.cpp | 2 +- src/loaders/webp/tvgWebpLoader.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/loaders/external_jpg/tvgJpgLoader.cpp b/src/loaders/external_jpg/tvgJpgLoader.cpp index f00993ab..1a4e7506 100644 --- a/src/loaders/external_jpg/tvgJpgLoader.cpp +++ b/src/loaders/external_jpg/tvgJpgLoader.cpp @@ -132,7 +132,7 @@ bool JpgLoader::read() //determine the image format TJPF format; - if (cs == ColorSpace::ARGB8888 || cs == ColorSpace::ARGB8888S) { + if (ImageLoader::cs == ColorSpace::ARGB8888 || ImageLoader::cs == ColorSpace::ARGB8888S) { format = TJPF_BGRX; surface.cs = ColorSpace::ARGB8888; } else { diff --git a/src/loaders/external_png/tvgPngLoader.cpp b/src/loaders/external_png/tvgPngLoader.cpp index 71bf25a6..c3624031 100644 --- a/src/loaders/external_png/tvgPngLoader.cpp +++ b/src/loaders/external_png/tvgPngLoader.cpp @@ -88,7 +88,7 @@ bool PngLoader::read() if (w == 0 || h == 0) return false; - if (cs == ColorSpace::ARGB8888 || cs == ColorSpace::ARGB8888S) { + if (ImageLoader::cs == ColorSpace::ARGB8888 || ImageLoader::cs == ColorSpace::ARGB8888S) { image->format = PNG_FORMAT_BGRA; surface.cs = ColorSpace::ARGB8888S; } else { diff --git a/src/loaders/webp/tvgWebpLoader.cpp b/src/loaders/webp/tvgWebpLoader.cpp index 97336fc3..3a66361d 100644 --- a/src/loaders/webp/tvgWebpLoader.cpp +++ b/src/loaders/webp/tvgWebpLoader.cpp @@ -138,7 +138,7 @@ bool WebpLoader::read() if (!data || w == 0 || h == 0) return false; - surface.cs = this->cs; + surface.cs = ImageLoader::cs; TaskScheduler::request(this);