diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-04-11 14:12:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-11 14:12:18 +0200 |
| commit | 5613ac37d658820fd0e4c3162f24a3b68414d3f9 (patch) | |
| tree | 533d5ed29331e94be8f6978fd98137844376d55b /core/io/image_loader.h | |
| parent | 2ec68599a45231767bb970e7bf06a3bf7ed5fc91 (diff) | |
| parent | 9381acb6a42da653cb6dfd9e610dfccead11aa98 (diff) | |
Merge pull request #59440 from bruvzg/fd_ref_counted
Diffstat (limited to 'core/io/image_loader.h')
| -rw-r--r-- | core/io/image_loader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/image_loader.h b/core/io/image_loader.h index 37d7620f96..9409617268 100644 --- a/core/io/image_loader.h +++ b/core/io/image_loader.h @@ -44,7 +44,7 @@ class ImageFormatLoader { friend class ResourceFormatLoaderImage; protected: - virtual Error load_image(Ref<Image> p_image, FileAccess *p_fileaccess, bool p_force_linear, float p_scale) = 0; + virtual Error load_image(Ref<Image> p_image, Ref<FileAccess> p_fileaccess, bool p_force_linear, float p_scale) = 0; virtual void get_recognized_extensions(List<String> *p_extensions) const = 0; bool recognize(const String &p_extension) const; @@ -58,7 +58,7 @@ class ImageLoader { protected: public: - static Error load_image(String p_file, Ref<Image> p_image, FileAccess *p_custom = nullptr, bool p_force_linear = false, float p_scale = 1.0); + static Error load_image(String p_file, Ref<Image> p_image, Ref<FileAccess> p_custom = Ref<FileAccess>(), bool p_force_linear = false, float p_scale = 1.0); static void get_recognized_extensions(List<String> *p_extensions); static ImageFormatLoader *recognize(const String &p_extension); |