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 /drivers | |
| 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 'drivers')
| -rw-r--r-- | drivers/png/image_loader_png.cpp | 2 | ||||
| -rw-r--r-- | drivers/png/image_loader_png.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp index 33d271248..30ec8cd03 100644 --- a/drivers/png/image_loader_png.cpp +++ b/drivers/png/image_loader_png.cpp @@ -201,7 +201,7 @@ Error ImageLoaderPNG::_load_image(void *rf_up, png_rw_ptr p_func, Ref<Image> p_i return OK; } -Error ImageLoaderPNG::load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear) { +Error ImageLoaderPNG::load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale) { Error err = _load_image(f, _read_png_data, p_image); f->close(); diff --git a/drivers/png/image_loader_png.h b/drivers/png/image_loader_png.h index f0a525a9e..c11e25e1a 100644 --- a/drivers/png/image_loader_png.h +++ b/drivers/png/image_loader_png.h @@ -43,7 +43,7 @@ class ImageLoaderPNG : public ImageFormatLoader { public: static Error _load_image(void *rf_up, png_rw_ptr p_func, Ref<Image> p_image); - virtual Error load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear); + virtual Error load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale); virtual void get_recognized_extensions(List<String> *p_extensions) const; ImageLoaderPNG(); }; |