From 70a005ee969dbdd0a859a295abd94f979ff9402f Mon Sep 17 00:00:00 2001
From: Thomas Holder <thomas@thomas-holder.de>
Date: Tue, 20 Nov 2018 10:27:20 +0100
Subject: -Werror=format -Werror=format-security

---
 src/live_effects/lpe-measure-segments.cpp | 6 ++----
 src/live_effects/lpe-measure-segments.h   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/live_effects/lpe-measure-segments.cpp b/src/live_effects/lpe-measure-segments.cpp
index fccce1fc6..827f4b5ac 100644
--- a/src/live_effects/lpe-measure-segments.cpp
+++ b/src/live_effects/lpe-measure-segments.cpp
@@ -424,7 +424,7 @@ LPEMeasureSegments::createTextLabel(Geom::Point pos, size_t counter, double leng
     font_size <<  fontsize << "pt";
     setlocale (LC_NUMERIC, locale_base);
     gchar c[32];
-    sprintf(c, "#%06x", rgb24);
+    sprintf(c, "#%06x", rgb32 >> 8);
     sp_repr_css_set_property (css, "fill",c);
     Inkscape::SVGOStringStream os;
     os << SP_RGBA32_A_F(coloropacity.get_value());
@@ -622,7 +622,7 @@ LPEMeasureSegments::createLine(Geom::Point start,Geom::Point end, Glib::ustring
     style  += "stroke-width:";
     style  += stroke_w.str();
     gchar c[32];
-    sprintf(c, "#%06x", rgb24);
+    sprintf(c, "#%06x", rgb32 >> 8);
     style += ";stroke:";
     style += Glib::ustring(c);
     Inkscape::SVGOStringStream os;
@@ -922,13 +922,11 @@ LPEMeasureSegments::doBeforeEffect (SPLPEItem const* lpeitem)
         } else {
             doc_scale = 1.0;
         }
-        unsigned long const color = coloropacity.get_value() >> 8;
         guint32 color32 = coloropacity.get_value();
         bool colorchanged = false;
         if (color32 != rgb32) {
             colorchanged = true;
         }
-        rgb24 = color;
         rgb32 = color32;
         SPCurve * c = nullptr;
         gchar * fontbutton_str = fontbutton.param_getSVGValue();
diff --git a/src/live_effects/lpe-measure-segments.h b/src/live_effects/lpe-measure-segments.h
index 4aa62dacc..ce97302cb 100644
--- a/src/live_effects/lpe-measure-segments.h
+++ b/src/live_effects/lpe-measure-segments.h
@@ -88,7 +88,6 @@ private:
     double fontsize;
     double anotation_width;
     double previous_size;
-    unsigned long rgb24;
     guint32 rgb32;
     double arrow_gap;
     guint pagenumber;
-- 
cgit v1.2.3