diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-25 16:51:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-25 16:51:26 +0200 |
| commit | 0cf0e960387620e6a206b5417b25aca008788043 (patch) | |
| tree | 26e9fe00f0ff3ae580c58aeb3f95d2fbf45642be /modules/svg | |
| parent | cfcdd576dd14fa98bc8404f4091f2f54eece3d87 (diff) | |
| parent | 672e9d6868dd422f87fdbf69e6b7f0ecd84c4b64 (diff) | |
Merge pull request #64776 from YuriSizov/import-images-moar-flags
Diffstat (limited to 'modules/svg')
| -rw-r--r-- | modules/svg/image_loader_svg.cpp | 4 | ||||
| -rw-r--r-- | modules/svg/image_loader_svg.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/svg/image_loader_svg.cpp b/modules/svg/image_loader_svg.cpp index 4c9302eb0c..5f839bd979 100644 --- a/modules/svg/image_loader_svg.cpp +++ b/modules/svg/image_loader_svg.cpp @@ -136,11 +136,11 @@ void ImageLoaderSVG::get_recognized_extensions(List<String> *p_extensions) const p_extensions->push_back("svg"); } -Error ImageLoaderSVG::load_image(Ref<Image> p_image, Ref<FileAccess> p_fileaccess, bool p_force_linear, float p_scale) { +Error ImageLoaderSVG::load_image(Ref<Image> p_image, Ref<FileAccess> p_fileaccess, uint32_t p_flags, float p_scale) { String svg = p_fileaccess->get_as_utf8_string(); create_image_from_string(p_image, svg, p_scale, false, HashMap<Color, Color>()); ERR_FAIL_COND_V(p_image->is_empty(), FAILED); - if (p_force_linear) { + if (p_flags & FLAG_FORCE_LINEAR) { p_image->srgb_to_linear(); } return OK; diff --git a/modules/svg/image_loader_svg.h b/modules/svg/image_loader_svg.h index f28df60c44..fc89b63edb 100644 --- a/modules/svg/image_loader_svg.h +++ b/modules/svg/image_loader_svg.h @@ -39,7 +39,7 @@ class ImageLoaderSVG : public ImageFormatLoader { public: void create_image_from_string(Ref<Image> p_image, String p_string, float p_scale, bool p_upsample, const HashMap<Color, Color> &p_color_map); - virtual Error load_image(Ref<Image> p_image, Ref<FileAccess> p_fileaccess, bool p_force_linear, float p_scale) override; + virtual Error load_image(Ref<Image> p_image, Ref<FileAccess> p_fileaccess, uint32_t p_flags, float p_scale) override; virtual void get_recognized_extensions(List<String> *p_extensions) const override; }; |