diff options
| author | Rémi Verschelde | 2017-08-21 23:49:07 +0200 |
|---|---|---|
| committer | GitHub | 2017-08-21 23:49:07 +0200 |
| commit | e9c43cecbf9a75fe474a27011425ab072217d376 (patch) | |
| tree | f41a77b8e2d8c387af06927fb4a4e4c9077ff95a /core | |
| parent | d37bd15cb92295ef22731a2ab171d0647ff541db (diff) | |
| parent | 0c18009665cc24ccdace885a2385321b77c80943 (diff) | |
| download | godot-e9c43cecbf9a75fe474a27011425ab072217d376.tar.gz godot-e9c43cecbf9a75fe474a27011425ab072217d376.tar.zst godot-e9c43cecbf9a75fe474a27011425ab072217d376.zip | |
Merge pull request #10433 from djrm/pr_svg_support
SVG support
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/image_loader.cpp | 4 | ||||
| -rw-r--r-- | core/io/image_loader.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp index 23719940b..7b5b4a13e 100644 --- a/core/io/image_loader.cpp +++ b/core/io/image_loader.cpp @@ -43,7 +43,7 @@ bool ImageFormatLoader::recognize(const String &p_extension) const { return false; } -Error ImageLoader::load_image(String p_file, Ref<Image> p_image, FileAccess *p_custom, bool p_force_linear) { +Error ImageLoader::load_image(String p_file, Ref<Image> p_image, FileAccess *p_custom, bool p_force_linear, float p_scale) { ERR_FAIL_COND_V(p_image.is_null(), ERR_INVALID_PARAMETER); FileAccess *f = p_custom; @@ -62,7 +62,7 @@ Error ImageLoader::load_image(String p_file, Ref<Image> p_image, FileAccess *p_c if (!loader[i]->recognize(extension)) continue; - Error err = loader[i]->load_image(p_image, f, p_force_linear); + Error err = loader[i]->load_image(p_image, f, p_force_linear, p_scale); if (err != ERR_FILE_UNRECOGNIZED) { diff --git a/core/io/image_loader.h b/core/io/image_loader.h index e528d1423..f79d9789b 100644 --- a/core/io/image_loader.h +++ b/core/io/image_loader.h @@ -56,7 +56,7 @@ class ImageFormatLoader { friend class ImageLoader; protected: - virtual Error load_image(Ref<Image> p_image, FileAccess *p_fileaccess, bool p_force_linear) = 0; + virtual Error load_image(Ref<Image> p_image, 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; @@ -75,7 +75,7 @@ class ImageLoader { protected: public: - static Error load_image(String p_file, Ref<Image> p_image, FileAccess *p_custom = NULL, bool p_force_linear = false); + static Error load_image(String p_file, Ref<Image> p_image, FileAccess *p_custom = NULL, bool p_force_linear = false, float p_scale = 1.0); static void get_recognized_extensions(List<String> *p_extensions); static bool recognize(const String &p_extension); |