X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcolors.cc;h=0bd3f8b04961875622ffb3c847697c7188e43fe6;hb=4fa4b9a1359131d861470376a34750211cf1a1ae;hp=03bfd8d4ce16df07e3268a703adc49c2ef9a608c;hpb=4dc63966f0872efe768dad61eb9b8785d06b92d1;p=ardour.git

diff --git a/libs/canvas/colors.cc b/libs/canvas/colors.cc
index 03bfd8d4ce..0bd3f8b049 100644
--- a/libs/canvas/colors.cc
+++ b/libs/canvas/colors.cc
@@ -36,7 +36,7 @@ using std::max;
 using std::min;
 
 ArdourCanvas::Color
-change_alpha (Color c, double a)
+ArdourCanvas::change_alpha (Color c, double a)
 {
 	return ((c & ~0xff) | (lrintf (a*255.0) & 0xff));
 }
@@ -55,9 +55,9 @@ ArdourCanvas::color_to_hsva (Color color, double& h, double& s, double& v, doubl
 	double cmax;
 	double cmin;
 	double delta;
-	
+
 	color_to_rgba (color, r, g, b, a);
-	
+
 	if (r > g) {
 		cmax = max (r, b);
 	} else {
@@ -81,7 +81,7 @@ ArdourCanvas::color_to_hsva (Color color, double& h, double& s, double& v, doubl
 		return;
 	}
 
-	if (delta != 0.0) {	
+	if (delta != 0.0) {
 		if (cmax == r) {
 			h = fmod ((g - b)/delta, 6.0);
 		} else if (cmax == g) {
@@ -89,9 +89,9 @@ ArdourCanvas::color_to_hsva (Color color, double& h, double& s, double& v, doubl
 		} else {
 			h = ((r - g)/delta) + 4;
 		}
-		
+
 		h *= 60.0;
-		
+
 		if (h < 0.0) {
 			/* negative values are legal but confusing, because
 			   they alias positive values.
@@ -259,6 +259,7 @@ HSV::HSV (const std::string& str)
 string
 HSV::to_string () const
 {
+	PBD::LocaleGuard lg;
 	stringstream ss;
 	ss << h << ' ';
 	ss << s << ' ';
@@ -341,7 +342,7 @@ HSV
 HSV::shade (double factor) const
 {
 	HSV hsv (*this);
-	
+
 	/* algorithm derived from a google palette website
 	   and analysis of their color palettes.
 
@@ -423,10 +424,10 @@ HSV::distance (const HSV& other) const
 		   perceptual distance of sqrt ((360^2) + 1 + 1) = 360. The 450
 		   are not evenly spread (Webers Law), so lets use 360 as an
 		   approximation of the number of distinct achromatics.
-		
+
 		   So, scale up the achromatic difference to give about
 		   a maximal distance between v = 1.0 and v = 0.0 of 360.
-		
+
 		   A difference of about 0.0055 will generate a return value of
 		   2, which is roughly the limit of human perceptual
 		   discrimination for chromatics.
@@ -467,7 +468,7 @@ HSV::distance (const HSV& other) const
 	const double xDE = sqrt (((sL - oL) * (sL - oL))
 				 + ((sA - oA) * (sA - oA))
 				 + ((sB - oB) * (sB - oB)));
-	
+
 	double xDH;
 
 	if (sqrt (xDE) > (sqrt (abs (xDL)) + sqrt (abs (xDC)))) {
@@ -482,7 +483,7 @@ HSV::distance (const HSV& other) const
 	xDL /= whtL;
 	xDC /= whtC * xSC;
 	xDH /= whtH * xSH;
-	
+
 	return sqrt ((xDL * xDL) + (xDC * xDC) + (xDH * xDH));
 }
 
@@ -596,7 +597,7 @@ SVAModifier::from_string (string const & str)
 string
 SVAModifier::to_string () const
 {
-	PBD::LocaleGuard lg ("C");
+	PBD::LocaleGuard lg;
 	stringstream ss;
 
 	switch (type) {
@@ -630,7 +631,7 @@ HSV
 SVAModifier::operator () (HSV& hsv)  const
 {
 	HSV r (hsv);
-	
+
 	switch (type) {
 	case Add:
 		r.s += _s;
@@ -658,3 +659,10 @@ SVAModifier::operator () (HSV& hsv)  const
 	return r;
 }
 
+ArdourCanvas::Color
+ArdourCanvas::color_at_alpha (ArdourCanvas::Color c, double a)
+{
+	double r, g, b, unused;
+	color_to_rgba (c, r, g, b, unused);
+	return rgba_to_color( r,g,b, a );
+}