diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-09-17 12:53:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-17 12:53:48 +0200 |
commit | c74bab66aaaef355ef8ac8d7e1a249509fad544e (patch) | |
tree | acb761bb28562f1f40e0e5736a9c79e91b4b7fb1 /modules/svg/image_loader_svg.cpp | |
parent | a1b4e4c607acb09c13bdf1b9609f2d45c4b01e15 (diff) | |
parent | 072e379ffe7f0d8adc2ac0eb700abfd7c27d8278 (diff) |
Merge pull request #11274 from Rubonnek/keep-argument-names-consistent
Renamed function arguments to keep them consistent between declaration and implementation
Diffstat (limited to 'modules/svg/image_loader_svg.cpp')
-rw-r--r-- | modules/svg/image_loader_svg.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/svg/image_loader_svg.cpp b/modules/svg/image_loader_svg.cpp index c575edbba3..e27452354b 100644 --- a/modules/svg/image_loader_svg.cpp +++ b/modules/svg/image_loader_svg.cpp @@ -128,13 +128,13 @@ Error ImageLoaderSVG::_create_image(Ref<Image> p_image, const PoolVector<uint8_t return OK; } -Error ImageLoaderSVG::create_image_from_string(Ref<Image> p_image, const char *svg_str, float p_scale, bool upsample, bool convert_colors) { +Error ImageLoaderSVG::create_image_from_string(Ref<Image> p_image, const char *p_svg_str, float p_scale, bool upsample, bool convert_colors) { - size_t str_len = strlen(svg_str); + size_t str_len = strlen(p_svg_str); PoolVector<uint8_t> src_data; src_data.resize(str_len + 1); PoolVector<uint8_t>::Write src_w = src_data.write(); - memcpy(src_w.ptr(), svg_str, str_len + 1); + memcpy(src_w.ptr(), p_svg_str, str_len + 1); return _create_image(p_image, &src_data, p_scale, upsample, convert_colors); } @@ -160,4 +160,4 @@ void ImageLoaderSVG::get_recognized_extensions(List<String> *p_extensions) const ImageLoaderSVG::ImageLoaderSVG() { } -ImageLoaderSVG::ReplaceColors ImageLoaderSVG::replace_colors;
\ No newline at end of file +ImageLoaderSVG::ReplaceColors ImageLoaderSVG::replace_colors; |