From 3fa4063d9b9e305c2db486b80ef58cc3186d3f6e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 14 Dec 2014 23:41:31 -0500 Subject: [PATCH] fix up SVAModifier constructors --- libs/canvas/canvas/colors.h | 3 ++- libs/canvas/colors.cc | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/canvas/canvas/colors.h b/libs/canvas/canvas/colors.h index dac14b437b..9bd8f89570 100644 --- a/libs/canvas/canvas/colors.h +++ b/libs/canvas/canvas/colors.h @@ -52,7 +52,8 @@ class LIBCANVAS_API SVAModifier public: SVAModifier (std::string const &); - SVAModifier (double ss, double vv, double aa) : s (ss) , v (vv) , a (aa) {} + SVAModifier (Type t, double ss, double vv, double aa) : type (t), s (ss) , v (vv) , a (aa) {} + SVAModifier () : type (Add), s (0), v (0), a (0) {} /* no-op modifier */ HSV operator () (HSV& hsv) const; std::string to_string () const; diff --git a/libs/canvas/colors.cc b/libs/canvas/colors.cc index 19ab783b78..f955e13c05 100644 --- a/libs/canvas/colors.cc +++ b/libs/canvas/colors.cc @@ -529,9 +529,9 @@ HSV::mod (SVAModifier const & svam) SVAModifier::SVAModifier (string const &str) : type (Add) - , s (-1.0) - , v (-1.0) - , a (-1.0) + , s (0) + , v (0) + , a (0) { from_string (str); }