Skip to content

Commit bafa856

Browse files
committed
Housekeeping
Increased LSS primary DPs. Removed OG adobeRGB overrides
1 parent ee5d73e commit bafa856

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

novideo_srgb/AdvancedWindow.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@
9090
<Label Grid.Row="0"
9191
Grid.Column="3">sat%</Label>
9292
<TextBox IsEnabled="False"
93-
Text="{Binding ScaledRedX, Mode=OneWay, StringFormat={}{0:#,0.000}}"
93+
Text="{Binding ScaledRedX, Mode=OneWay, StringFormat={}{0:#,0.00000}}"
9494
IsReadOnly="True"
9595
Grid.Row="0"
9696
Grid.Column="4"
9797
VerticalAlignment="Center" />
9898
<Label Grid.Row="0"
9999
Grid.Column="5">x</Label>
100100
<TextBox IsEnabled="False"
101-
Text="{Binding ScaledRedY, Mode=OneWay, StringFormat={}{0:#,0.000}}"
101+
Text="{Binding ScaledRedY, Mode=OneWay, StringFormat={}{0:#,0.00000}}"
102102
IsReadOnly="True"
103103
Grid.Row="0"
104104
Grid.Column="6"
@@ -131,15 +131,15 @@
131131
<Label Grid.Row="1"
132132
Grid.Column="3">sat%</Label>
133133
<TextBox IsEnabled="False"
134-
Text="{Binding ScaledGreenX, Mode=OneWay, StringFormat={}{0:#,0.000}}"
134+
Text="{Binding ScaledGreenX, Mode=OneWay, StringFormat={}{0:#,0.00000}}"
135135
IsReadOnly="True"
136136
Grid.Row="1"
137137
Grid.Column="4"
138138
VerticalAlignment="Center" />
139139
<Label Grid.Row="1"
140140
Grid.Column="5">x</Label>
141141
<TextBox IsEnabled="False"
142-
Text="{Binding ScaledGreenY, Mode=OneWay, StringFormat={}{0:#,0.000}}"
142+
Text="{Binding ScaledGreenY, Mode=OneWay, StringFormat={}{0:#,0.00000}}"
143143
IsReadOnly="True"
144144
Grid.Row="1"
145145
Grid.Column="6"
@@ -170,15 +170,15 @@
170170
<Label Grid.Row="2"
171171
Grid.Column="3">sat%</Label>
172172
<TextBox IsEnabled="False"
173-
Text="{Binding ScaledBlueX, Mode=OneWay, StringFormat={}{0:#,0.000}}"
173+
Text="{Binding ScaledBlueX, Mode=OneWay, StringFormat={}{0:#,0.00000}}"
174174
IsReadOnly="True"
175175
Grid.Row="2"
176176
Grid.Column="4"
177177
VerticalAlignment="Center" />
178178
<Label Grid.Row="2"
179179
Grid.Column="5">x</Label>
180180
<TextBox IsEnabled="False"
181-
Text="{Binding ScaledBlueY, Mode=OneWay, StringFormat={}{0:#,0.000}}"
181+
Text="{Binding ScaledBlueY, Mode=OneWay, StringFormat={}{0:#,0.00000}}"
182182
IsReadOnly="True"
183183
Grid.Row="2"
184184
Grid.Column="6"

novideo_srgb/Colorimetry.cs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ public override int GetHashCode()
7979

8080
public static ColorSpace AdobeRGB = new ColorSpace
8181
{
82-
Red = new Point { X = 0.66, Y = 0.330156 },
83-
Green = new Point { X = 0.29524, Y = 0.7 },
84-
Blue = new Point { X = 0.14, Y = 0.043393 },
82+
Red = new Point { X = 0.64, Y = 0.33 },
83+
Green = new Point { X = 0.21, Y = 0.71 },
84+
Blue = new Point { X = 0.15, Y = 0.06 },
8585
White = D65
8686
};
8787

@@ -93,15 +93,7 @@ public override int GetHashCode()
9393
White = D65
9494
};
9595

96-
public static ColorSpace SatSRGB = new ColorSpace
97-
{
98-
Red = new Point { X = 0.66, Y = 0.330156 },
99-
Green = new Point { X = 0.29524, Y = 0.7 },
100-
Blue = new Point { X = 0.14, Y = 0.043393 },
101-
White = D65
102-
};
103-
104-
public static ColorSpace[] ColorSpaces => new[] { sRGB, DisplayP3, AdobeRGB, BT2020, SatSRGB };
96+
public static ColorSpace[] ColorSpaces => new[] { sRGB, DisplayP3, AdobeRGB, BT2020};
10597

10698
public static Matrix D50 = Matrix.FromValues(new[,] { { 0.9642 }, { 1 }, { 0.8249 } });
10799

0 commit comments

Comments
 (0)