From 146147a171b216f7f1b874e914c3de0494a96d19 Mon Sep 17 00:00:00 2001 From: Nathan Johansen Date: Sun, 15 Jan 2023 18:26:25 +0000 Subject: [PATCH 1/3] Updating deprecated instances of sprintf with snprintf --- src/extension/internal/pov-out.cpp | 2 +- src/libnrtype/Layout-TNG-Output.cpp | 8 ++++---- src/live_effects/lpe-measure-segments.cpp | 4 ++-- src/live_effects/lpe-powermask.cpp | 2 +- src/live_effects/parameter/colorpicker.cpp | 4 ++-- src/svg/svg-color.cpp | 6 +++--- src/trace/autotrace/inkscape-autotrace.cpp | 2 +- src/ui/svg-renderer.cpp | 4 ++-- src/ui/widget/registered-widget.cpp | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp index 96daafb034..1ef6593359 100644 --- a/src/extension/internal/pov-out.cpp +++ b/src/extension/internal/pov-out.cpp @@ -459,7 +459,7 @@ bool PovOutput::doTreeRecursive(SPDocument *doc, SPObject *obj) if (!obj->getId()) { char buf[16]; - sprintf(buf, "id%d", idIndex++); + snprintf(buf, "id%d", idIndex++); id = buf; } else diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index ec22d5e397..d51ea5cb13 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -58,17 +58,17 @@ char *smuggle_adxkyrtl_in(const char *string, int ndx, float *adx, float ky, flo char *smuggle=(char *)malloc(newsize); strcpy(smuggle,string); // text to pass, includes the first fake terminator char *cptr = smuggle + slen + 1; // immediately after the first fake terminator - sprintf(cptr,"%07d",ndx); // number of widths to pass + snprintf(cptr,"%07d",ndx); // number of widths to pass cptr+=7; // advance over ndx for(int i=0; i> 8); + snprintf(c, "#%06x", rgb32 >> 8); sp_repr_css_set_property (css, "fill",c); Inkscape::SVGOStringStream os; os << SP_RGBA32_A_F(coloropacity.get_value()); @@ -631,7 +631,7 @@ LPEMeasureSegments::createLine(Geom::Point start,Geom::Point end, Glib::ustring style += "stroke-width:"; style += stroke_w.str(); gchar c[32]; - sprintf(c, "#%06x", rgb32 >> 8); + snprintf(c, "#%06x", rgb32 >> 8); style += ";stroke:"; style += Glib::ustring(c); Inkscape::SVGOStringStream os; diff --git a/src/live_effects/lpe-powermask.cpp b/src/live_effects/lpe-powermask.cpp index f854db56af..a4d534ce80 100644 --- a/src/live_effects/lpe-powermask.cpp +++ b/src/live_effects/lpe-powermask.cpp @@ -242,7 +242,7 @@ LPEPowerMask::setMask(){ Glib::ustring style; gchar c[32]; unsigned const rgb24 = background_color.get_value() >> 8; - sprintf(c, "#%06x", rgb24); + snprintf(c, "#%06x", rgb24); style = Glib::ustring("fill:") + Glib::ustring(c); Inkscape::SVGOStringStream os; os << SP_RGBA32_A_F(background_color.get_value()); diff --git a/src/live_effects/parameter/colorpicker.cpp b/src/live_effects/parameter/colorpicker.cpp index cf9243e37f..80695c0250 100644 --- a/src/live_effects/parameter/colorpicker.cpp +++ b/src/live_effects/parameter/colorpicker.cpp @@ -91,7 +91,7 @@ Glib::ustring ColorPickerParam::param_getSVGValue() const { gchar c[32]; - sprintf(c, "#%08x", value); + snprintf(c, "#%08x", value); return c; } @@ -99,7 +99,7 @@ Glib::ustring ColorPickerParam::param_getDefaultSVGValue() const { gchar c[32]; - sprintf(c, "#%08x", defvalue); + snprintf(c, "#%08x", defvalue); return c; } diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index dbb8195ba0..c4eea40270 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -17,7 +17,7 @@ #endif #include -#include // sprintf +#include // snprintf #include #include #include @@ -457,12 +457,12 @@ static void rgb24_to_css(char *const buf, unsigned const rgb24) default: { if ((rgb24 & 0xf0f0f) * 0x11 == rgb24) { /* Can use the shorter three-digit form #rgb instead of #rrggbb. */ - std::sprintf(buf, "#%x%x%x", + std::snprintf(buf, "#%x%x%x", (rgb24 >> 16) & 0xf, (rgb24 >> 8) & 0xf, rgb24 & 0xf); } else { - std::sprintf(buf, "#%06x", rgb24); + std::snprintf(buf, "#%06x", rgb24); } break; } diff --git a/src/trace/autotrace/inkscape-autotrace.cpp b/src/trace/autotrace/inkscape-autotrace.cpp index b03223562f..f7e880489a 100644 --- a/src/trace/autotrace/inkscape-autotrace.cpp +++ b/src/trace/autotrace/inkscape-autotrace.cpp @@ -145,7 +145,7 @@ std::vector AutotraceTracingEngine::trace(Glib::RefPtr(r * 0xff + 0.5), static_cast(g * 0xff + 0.5), static_cast(b * 0xff + 0.5) @@ -43,7 +43,7 @@ Glib::ustring rgba_to_css_color(const SPColor& color) { Glib::ustring double_to_css_value(double value) { char buffer[32]; // arbitrarily chosen precision - sprintf(buffer, "%.4f", value); + snprintf(buffer, "%.4f", value); return Glib::ustring(buffer); } diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index aaea66831c..eb8de11acb 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -408,7 +408,7 @@ RegisteredColorPicker::on_changed (guint32 rgba) } gchar c[32]; if (_akey == _ckey + "_opacity_LPE") { //For LPE parameter we want stored with alpha - sprintf(c, "#%08x", rgba); + snprintf(c, "#%08x", rgba); } else { sp_svg_write_color(c, sizeof(c), rgba); } -- GitLab From 15dff02c453dcb88445ea4c9df163b88288735f7 Mon Sep 17 00:00:00 2001 From: Nathan Johansen Date: Sat, 8 Apr 2023 14:06:36 +0000 Subject: [PATCH 2/3] Revert "Updating deprecated instances of sprintf with snprintf" This reverts commit 146147a171b216f7f1b874e914c3de0494a96d19 --- src/extension/internal/pov-out.cpp | 2 +- src/libnrtype/Layout-TNG-Output.cpp | 8 ++++---- src/live_effects/lpe-measure-segments.cpp | 4 ++-- src/live_effects/lpe-powermask.cpp | 2 +- src/live_effects/parameter/colorpicker.cpp | 4 ++-- src/svg/svg-color.cpp | 6 +++--- src/trace/autotrace/inkscape-autotrace.cpp | 2 +- src/ui/svg-renderer.cpp | 4 ++-- src/ui/widget/registered-widget.cpp | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp index 1ef6593359..96daafb034 100644 --- a/src/extension/internal/pov-out.cpp +++ b/src/extension/internal/pov-out.cpp @@ -459,7 +459,7 @@ bool PovOutput::doTreeRecursive(SPDocument *doc, SPObject *obj) if (!obj->getId()) { char buf[16]; - snprintf(buf, "id%d", idIndex++); + sprintf(buf, "id%d", idIndex++); id = buf; } else diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index d51ea5cb13..ec22d5e397 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -58,17 +58,17 @@ char *smuggle_adxkyrtl_in(const char *string, int ndx, float *adx, float ky, flo char *smuggle=(char *)malloc(newsize); strcpy(smuggle,string); // text to pass, includes the first fake terminator char *cptr = smuggle + slen + 1; // immediately after the first fake terminator - snprintf(cptr,"%07d",ndx); // number of widths to pass + sprintf(cptr,"%07d",ndx); // number of widths to pass cptr+=7; // advance over ndx for(int i=0; i> 8); + sprintf(c, "#%06x", rgb32 >> 8); sp_repr_css_set_property (css, "fill",c); Inkscape::SVGOStringStream os; os << SP_RGBA32_A_F(coloropacity.get_value()); @@ -631,7 +631,7 @@ LPEMeasureSegments::createLine(Geom::Point start,Geom::Point end, Glib::ustring style += "stroke-width:"; style += stroke_w.str(); gchar c[32]; - snprintf(c, "#%06x", rgb32 >> 8); + sprintf(c, "#%06x", rgb32 >> 8); style += ";stroke:"; style += Glib::ustring(c); Inkscape::SVGOStringStream os; diff --git a/src/live_effects/lpe-powermask.cpp b/src/live_effects/lpe-powermask.cpp index a4d534ce80..f854db56af 100644 --- a/src/live_effects/lpe-powermask.cpp +++ b/src/live_effects/lpe-powermask.cpp @@ -242,7 +242,7 @@ LPEPowerMask::setMask(){ Glib::ustring style; gchar c[32]; unsigned const rgb24 = background_color.get_value() >> 8; - snprintf(c, "#%06x", rgb24); + sprintf(c, "#%06x", rgb24); style = Glib::ustring("fill:") + Glib::ustring(c); Inkscape::SVGOStringStream os; os << SP_RGBA32_A_F(background_color.get_value()); diff --git a/src/live_effects/parameter/colorpicker.cpp b/src/live_effects/parameter/colorpicker.cpp index 80695c0250..cf9243e37f 100644 --- a/src/live_effects/parameter/colorpicker.cpp +++ b/src/live_effects/parameter/colorpicker.cpp @@ -91,7 +91,7 @@ Glib::ustring ColorPickerParam::param_getSVGValue() const { gchar c[32]; - snprintf(c, "#%08x", value); + sprintf(c, "#%08x", value); return c; } @@ -99,7 +99,7 @@ Glib::ustring ColorPickerParam::param_getDefaultSVGValue() const { gchar c[32]; - snprintf(c, "#%08x", defvalue); + sprintf(c, "#%08x", defvalue); return c; } diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index c4eea40270..dbb8195ba0 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -17,7 +17,7 @@ #endif #include -#include // snprintf +#include // sprintf #include #include #include @@ -457,12 +457,12 @@ static void rgb24_to_css(char *const buf, unsigned const rgb24) default: { if ((rgb24 & 0xf0f0f) * 0x11 == rgb24) { /* Can use the shorter three-digit form #rgb instead of #rrggbb. */ - std::snprintf(buf, "#%x%x%x", + std::sprintf(buf, "#%x%x%x", (rgb24 >> 16) & 0xf, (rgb24 >> 8) & 0xf, rgb24 & 0xf); } else { - std::snprintf(buf, "#%06x", rgb24); + std::sprintf(buf, "#%06x", rgb24); } break; } diff --git a/src/trace/autotrace/inkscape-autotrace.cpp b/src/trace/autotrace/inkscape-autotrace.cpp index f7e880489a..b03223562f 100644 --- a/src/trace/autotrace/inkscape-autotrace.cpp +++ b/src/trace/autotrace/inkscape-autotrace.cpp @@ -145,7 +145,7 @@ std::vector AutotraceTracingEngine::trace(Glib::RefPtr(r * 0xff + 0.5), static_cast(g * 0xff + 0.5), static_cast(b * 0xff + 0.5) @@ -43,7 +43,7 @@ Glib::ustring rgba_to_css_color(const SPColor& color) { Glib::ustring double_to_css_value(double value) { char buffer[32]; // arbitrarily chosen precision - snprintf(buffer, "%.4f", value); + sprintf(buffer, "%.4f", value); return Glib::ustring(buffer); } diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index eb8de11acb..aaea66831c 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -408,7 +408,7 @@ RegisteredColorPicker::on_changed (guint32 rgba) } gchar c[32]; if (_akey == _ckey + "_opacity_LPE") { //For LPE parameter we want stored with alpha - snprintf(c, "#%08x", rgba); + sprintf(c, "#%08x", rgba); } else { sp_svg_write_color(c, sizeof(c), rgba); } -- GitLab From bd17e6aac2bd8bdef826cfc231460f2db63e9743 Mon Sep 17 00:00:00 2001 From: Nathan Johansen Date: Sat, 8 Apr 2023 14:23:56 +0000 Subject: [PATCH 3/3] Update 2 files - /src/trace/autotrace/inkscape-autotrace.cpp - /src/ui/svg-renderer.cpp --- src/trace/autotrace/inkscape-autotrace.cpp | 2 +- src/ui/svg-renderer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/trace/autotrace/inkscape-autotrace.cpp b/src/trace/autotrace/inkscape-autotrace.cpp index b03223562f..3feea4c0bd 100644 --- a/src/trace/autotrace/inkscape-autotrace.cpp +++ b/src/trace/autotrace/inkscape-autotrace.cpp @@ -145,7 +145,7 @@ std::vector AutotraceTracingEngine::trace(Glib::RefPtr(r * 0xff + 0.5), static_cast(g * 0xff + 0.5), static_cast(b * 0xff + 0.5) @@ -43,7 +43,7 @@ Glib::ustring rgba_to_css_color(const SPColor& color) { Glib::ustring double_to_css_value(double value) { char buffer[32]; // arbitrarily chosen precision - sprintf(buffer, "%.4f", value); + snprintf(buffer, sizeof(buffer), "%.4f", value); return Glib::ustring(buffer); } -- GitLab