joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

internal/f32color: revert incorrect NRGBA to linear color change

Browse Source 
Egon Elbre convinced me commit 01d5e72291 was incorrect, because
in the NRGBA colorspace the alpha value is linear, not gamma adjusted.

Updates gio#192

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-01-16 09:58:04 +01:00
parent 01d5e72291
commit 99bfa6a33c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/f32color/rgba.go
+6 -6
View File
@@ -28,9 +28,9 @@ func (col RGBA) SRGB() color.NRGBA {
return color.NRGBA{}
}
return color.NRGBA{
R: uint8(linearTosRGB(col.R)/col.A*255 + .5),
G: uint8(linearTosRGB(col.G)/col.A*255 + .5),
B: uint8(linearTosRGB(col.B)/col.A*255 + .5),
R: uint8(linearTosRGB(col.R/col.A)*255 + .5),
G: uint8(linearTosRGB(col.G/col.A)*255 + .5),
B: uint8(linearTosRGB(col.B/col.A)*255 + .5),
A: uint8(col.A*255 + .5),
}
}
@@ -53,9 +53,9 @@ func (col RGBA) Opaque() RGBA {
func LinearFromSRGB(col color.NRGBA) RGBA {
af := float32(col.A) / 0xFF
return RGBA{
R: sRGBToLinear(float32(col.R) / 0xff * af),
G: sRGBToLinear(float32(col.G) / 0xff * af),
B: sRGBToLinear(float32(col.B) / 0xff * af),
R: sRGBToLinear(float32(col.R)/0xff) * af,
G: sRGBToLinear(float32(col.G)/0xff) * af,
B: sRGBToLinear(float32(col.B)/0xff) * af,
A: af,
}
}