Skip to content

Commit 1fefc9b

Browse files
authored
Fix code style issues in ColorManipulation (#3565)
1 parent 02c2ec4 commit 1fefc9b

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

src/MaterialDesignColors.Wpf/ColorManipulation/HsbExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static Hsb ToHsb(this Color color)
4848
g /= 255;
4949
b /= 255;
5050

51-
double[] rgb = new[] { r, g, b };
51+
double[] rgb = [r, g, b];
5252
double max = rgb.Max();
5353
double min = rgb.Min();
5454
double v = max;

src/MaterialDesignColors.Wpf/ColorManipulation/HslExtensions.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ internal static class HslExtensions
66
{
77
public static Color ToColor(this Hsl hsl)
88
{
9-
double hsv_rbg(double v1, double v2, double vH)
9+
static double hsv_rbg(double v1, double v2, double vH)
1010
{
1111
if (vH < 0) vH += 1;
1212
if (vH > 1) vH -= 1;
@@ -16,9 +16,9 @@ double hsv_rbg(double v1, double v2, double vH)
1616
return (v1);
1717
}
1818

19-
var h = hsl.H * (1.0 / 360);
20-
var s = hsl.S * (1.0 / 100);
21-
var l = hsl.L * (1.0 / 100);
19+
double h = hsl.H * (1.0 / 360);
20+
double s = hsl.S * (1.0 / 100);
21+
double l = hsl.L * (1.0 / 100);
2222

2323
double r, g, b;
2424
if (s == 0)
@@ -33,7 +33,7 @@ double hsv_rbg(double v1, double v2, double vH)
3333
if (l < 0.5) var_2 = l * (1 + s);
3434
else var_2 = (l + s) - (s * l);
3535

36-
var var_1 = 2 * l - var_2;
36+
double var_1 = 2 * l - var_2;
3737

3838
r = 255 * hsv_rbg(var_1, var_2, h + (1.0 / 3));
3939
g = 255 * hsv_rbg(var_1, var_2, h);

src/MaterialDesignColors.Wpf/ColorManipulation/LabExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static Lab ToLab(this Color c)
99

1010
public static Lab ToLab(this Xyz xyz)
1111
{
12-
double xyz_lab(double v)
12+
static double xyz_lab(double v)
1313
{
1414
if (v > LabConstants.e)
1515
return Math.Pow(v, 1 / 3.0);

src/MaterialDesignColors.Wpf/ColorManipulation/XyzExtensions.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ byte clip(double d)
2020
if (d > 255) return 255;
2121
return (byte)Math.Round(d);
2222
}
23-
var r = xyz_rgb(3.2404542 * xyz.X - 1.5371385 * xyz.Y - 0.4985314 * xyz.Z);
24-
var g = xyz_rgb(-0.9692660 * xyz.X + 1.8760108 * xyz.Y + 0.0415560 * xyz.Z);
25-
var b = xyz_rgb(0.0556434 * xyz.X - 0.2040259 * xyz.Y + 1.0572252 * xyz.Z);
23+
double r = xyz_rgb(3.2404542 * xyz.X - 1.5371385 * xyz.Y - 0.4985314 * xyz.Z);
24+
double g = xyz_rgb(-0.9692660 * xyz.X + 1.8760108 * xyz.Y + 0.0415560 * xyz.Z);
25+
double b = xyz_rgb(0.0556434 * xyz.X - 0.2040259 * xyz.Y + 1.0572252 * xyz.Z);
2626

2727
return Color.FromRgb(clip(r), clip(g), clip(b));
2828
}
2929
public static Xyz ToXyz(this Color c)
3030
{
31-
double rgb_xyz(double v)
31+
static double rgb_xyz(double v)
3232
{
3333
v /= 255;
3434
if (v > 0.04045)
@@ -37,29 +37,29 @@ double rgb_xyz(double v)
3737
return v / 12.92;
3838
}
3939

40-
var r = rgb_xyz(c.R);
41-
var g = rgb_xyz(c.G);
42-
var b = rgb_xyz(c.B);
40+
double r = rgb_xyz(c.R);
41+
double g = rgb_xyz(c.G);
42+
double b = rgb_xyz(c.B);
4343

44-
var x = 0.4124564 * r + 0.3575761 * g + 0.1804375 * b;
45-
var y = 0.2126729 * r + 0.7151522 * g + 0.0721750 * b;
46-
var z = 0.0193339 * r + 0.1191920 * g + 0.9503041 * b;
44+
double x = 0.4124564 * r + 0.3575761 * g + 0.1804375 * b;
45+
double y = 0.2126729 * r + 0.7151522 * g + 0.0721750 * b;
46+
double z = 0.0193339 * r + 0.1191920 * g + 0.9503041 * b;
4747
return new Xyz(x, y, z);
4848
}
4949

5050
public static Xyz ToXyz(this Lab lab)
5151
{
52-
double lab_xyz(double d)
52+
static double lab_xyz(double d)
5353
{
5454
if (d > LabConstants.eCubedRoot)
5555
return d * d * d;
5656
else
5757
return (116 * d - 16) / LabConstants.k;
5858
}
5959

60-
var y = (lab.L + 16.0) / 116.0;
61-
var x = double.IsNaN(lab.A) ? y : y + lab.A / 500.0;
62-
var z = double.IsNaN(lab.B) ? y : y - lab.B / 200.0;
60+
double y = (lab.L + 16.0) / 116.0;
61+
double x = double.IsNaN(lab.A) ? y : y + lab.A / 500.0;
62+
double z = double.IsNaN(lab.B) ? y : y - lab.B / 200.0;
6363

6464
y = LabConstants.WhitePointY * lab_xyz(y);
6565
x = LabConstants.WhitePointX * lab_xyz(x);

0 commit comments

Comments
 (0)