From 072e379ffe7f0d8adc2ac0eb700abfd7c27d8278 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Thu, 14 Sep 2017 13:49:11 -0400 Subject: Renamed function arguments to keep them consistent between declaration and implementation --- modules/regex/regex.h | 4 ++-- modules/svg/image_loader_svg.cpp | 8 ++++---- modules/svg/image_loader_svg.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'modules') diff --git a/modules/regex/regex.h b/modules/regex/regex.h index 0d97bcce54..bfa9c84042 100644 --- a/modules/regex/regex.h +++ b/modules/regex/regex.h @@ -87,8 +87,8 @@ public: Error compile(const String &p_pattern); void _init(const String &p_pattern = ""); - Ref search(const String &p_subject, int offset = 0, int end = -1) const; - String sub(const String &p_subject, const String &p_replacement, bool p_all = false, int p_start = 0, int p_end = -1) const; + Ref search(const String &p_subject, int p_offset = 0, int p_end = -1) const; + String sub(const String &p_subject, const String &p_replacement, bool p_all = false, int p_offset = 0, int p_end = -1) const; bool is_valid() const; String get_pattern() const; 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 p_image, const PoolVector p_image, const char *svg_str, float p_scale, bool upsample, bool convert_colors) { +Error ImageLoaderSVG::create_image_from_string(Ref 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 src_data; src_data.resize(str_len + 1); PoolVector::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 *p_extensions) const ImageLoaderSVG::ImageLoaderSVG() { } -ImageLoaderSVG::ReplaceColors ImageLoaderSVG::replace_colors; \ No newline at end of file +ImageLoaderSVG::ReplaceColors ImageLoaderSVG::replace_colors; diff --git a/modules/svg/image_loader_svg.h b/modules/svg/image_loader_svg.h index 332ac214a5..cf44cd8c50 100644 --- a/modules/svg/image_loader_svg.h +++ b/modules/svg/image_loader_svg.h @@ -57,7 +57,7 @@ class ImageLoaderSVG : public ImageFormatLoader { List new_colors; } replace_colors; static SVGRasterizer rasterizer; - static void _convert_colors(NSVGimage *p_svg_imge); + static void _convert_colors(NSVGimage *p_svg_image); static Error _create_image(Ref p_image, const PoolVector *p_data, float p_scale, bool upsample, bool convert_colors = false); public: -- cgit v1.2.3