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 /drivers | |
| parent | cfcdd576dd14fa98bc8404f4091f2f54eece3d87 (diff) | |
| parent | 672e9d6868dd422f87fdbf69e6b7f0ecd84c4b64 (diff) | |
Merge pull request #64776 from YuriSizov/import-images-moar-flags
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/png/image_loader_png.cpp | 4 | ||||
| -rw-r--r-- | drivers/png/image_loader_png.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp index 917bfec574..8d2f8a7ed6 100644 --- a/drivers/png/image_loader_png.cpp +++ b/drivers/png/image_loader_png.cpp @@ -36,7 +36,7 @@ #include <string.h> -Error ImageLoaderPNG::load_image(Ref<Image> p_image, Ref<FileAccess> f, bool p_force_linear, float p_scale) { +Error ImageLoaderPNG::load_image(Ref<Image> p_image, Ref<FileAccess> f, uint32_t p_flags, float p_scale) { const uint64_t buffer_size = f->get_length(); Vector<uint8_t> file_buffer; Error err = file_buffer.resize(buffer_size); @@ -48,7 +48,7 @@ Error ImageLoaderPNG::load_image(Ref<Image> p_image, Ref<FileAccess> f, bool p_f f->get_buffer(writer, buffer_size); } const uint8_t *reader = file_buffer.ptr(); - return PNGDriverCommon::png_to_image(reader, buffer_size, p_force_linear, p_image); + return PNGDriverCommon::png_to_image(reader, buffer_size, p_flags & FLAG_FORCE_LINEAR, p_image); } void ImageLoaderPNG::get_recognized_extensions(List<String> *p_extensions) const { diff --git a/drivers/png/image_loader_png.h b/drivers/png/image_loader_png.h index 9bcfb720d3..91c3c8925f 100644 --- a/drivers/png/image_loader_png.h +++ b/drivers/png/image_loader_png.h @@ -40,7 +40,7 @@ private: static Ref<Image> load_mem_png(const uint8_t *p_png, int p_size); public: - virtual Error load_image(Ref<Image> p_image, Ref<FileAccess> f, bool p_force_linear, float p_scale); + virtual Error load_image(Ref<Image> p_image, Ref<FileAccess> f, uint32_t p_flags, float p_scale); virtual void get_recognized_extensions(List<String> *p_extensions) const; ImageLoaderPNG(); }; |