From 672e9d6868dd422f87fdbf69e6b7f0ecd84c4b64 Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Tue, 23 Aug 2022 13:25:14 +0300 Subject: Make `ImageLoader` take bit field flags --- modules/tinyexr/image_loader_tinyexr.cpp | 6 +++--- modules/tinyexr/image_loader_tinyexr.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/tinyexr') diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/modules/tinyexr/image_loader_tinyexr.cpp index 864df765ee..6f61251f9b 100644 --- a/modules/tinyexr/image_loader_tinyexr.cpp +++ b/modules/tinyexr/image_loader_tinyexr.cpp @@ -37,7 +37,7 @@ #include "thirdparty/tinyexr/tinyexr.h" -Error ImageLoaderTinyEXR::load_image(Ref p_image, Ref f, bool p_force_linear, float p_scale) { +Error ImageLoaderTinyEXR::load_image(Ref p_image, Ref f, uint32_t p_flags, float p_scale) { Vector src_image; uint64_t src_image_len = f->get_length(); ERR_FAIL_COND_V(src_image_len == 0, ERR_FILE_CORRUPT); @@ -229,7 +229,7 @@ Error ImageLoaderTinyEXR::load_image(Ref p_image, Ref f, bool color.a = *a_channel++; } - if (p_force_linear) { + if (p_flags & FLAG_FORCE_LINEAR) { color = color.srgb_to_linear(); } @@ -260,7 +260,7 @@ Error ImageLoaderTinyEXR::load_image(Ref p_image, Ref f, bool color.a = *a_channel++; } - if (p_force_linear) { + if (p_flags & FLAG_FORCE_LINEAR) { color = color.srgb_to_linear(); } diff --git a/modules/tinyexr/image_loader_tinyexr.h b/modules/tinyexr/image_loader_tinyexr.h index 0d3de93956..8da2a0d4af 100644 --- a/modules/tinyexr/image_loader_tinyexr.h +++ b/modules/tinyexr/image_loader_tinyexr.h @@ -35,7 +35,7 @@ class ImageLoaderTinyEXR : public ImageFormatLoader { public: - virtual Error load_image(Ref p_image, Ref f, bool p_force_linear, float p_scale); + virtual Error load_image(Ref p_image, Ref f, uint32_t p_flags, float p_scale); virtual void get_recognized_extensions(List *p_extensions) const; ImageLoaderTinyEXR(); }; -- cgit v1.2.3