summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-12-14 23:41:31 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2014-12-14 23:41:31 -0500
commit3fa4063d9b9e305c2db486b80ef58cc3186d3f6e (patch)
treef163183e813d6a39c51f87d2dd28b54526960efe
parent0bdfa05fb3b5040376c81ac28fe8ae96613f7a3d (diff)
fix up SVAModifier constructors
-rw-r--r--libs/canvas/canvas/colors.h3
-rw-r--r--libs/canvas/colors.cc6
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);
}