From 2296c80d288b4c3b811a1af3fe6c4364c99cdb00 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 21 Apr 2021 17:17:39 +0200 Subject: [PATCH] internal/f32color: delete unused NRGBAToRGBA_PostAlpha Signed-off-by: Elias Naur --- internal/f32color/rgba.go | 18 ------------------ internal/f32color/rgba_test.go | 15 --------------- 2 files changed, 33 deletions(-) diff --git a/internal/f32color/rgba.go b/internal/f32color/rgba.go index c5b5d198..eecf0184 100644 --- a/internal/f32color/rgba.go +++ b/internal/f32color/rgba.go @@ -93,24 +93,6 @@ func NRGBAToLinearRGBA(col color.NRGBA) color.RGBA { } } -// NRGBAToRGBA_PostAlpha converts from non-premultiplied sRGB color to premultiplied sRGB color. -// -// Each component in the result is `sRGBToLinear(c) * alpha`, where `c` -// is the linear color. -func NRGBAToRGBA_PostAlpha(col color.NRGBA) color.RGBA { - if col.A == 0xFF { - return color.RGBA(col) - } else if col.A == 0x00 { - return color.RGBA{} - } - return color.RGBA{ - R: uint8(uint32(col.R) * uint32(col.A) / 0xFF), - G: uint8(uint32(col.G) * uint32(col.A) / 0xFF), - B: uint8(uint32(col.B) * uint32(col.A) / 0xFF), - A: col.A, - } -} - // RGBAToNRGBA converts from premultiplied sRGB color to non-premultiplied sRGB color. func RGBAToNRGBA(col color.RGBA) color.NRGBA { if col.A == 0xFF { diff --git a/internal/f32color/rgba_test.go b/internal/f32color/rgba_test.go index f30cfad9..ea0f8712 100644 --- a/internal/f32color/rgba_test.go +++ b/internal/f32color/rgba_test.go @@ -7,21 +7,6 @@ import ( "testing" ) -func TestNRGBAToRGBA_PostAlpha_Boundary(t *testing.T) { - for col := 0; col <= 0xFF; col++ { - for alpha := 0; alpha <= 0xFF; alpha++ { - in := color.NRGBA{R: uint8(col), A: uint8(alpha)} - premul := NRGBAToRGBA_PostAlpha(in) - if premul.A != uint8(alpha) { - t.Errorf("%v: got %v expected %v", in, premul.A, alpha) - } - if premul.R > premul.A { - t.Errorf("%v: R=%v > A=%v", in, premul.R, premul.A) - } - } - } -} - func TestNRGBAToLinearRGBA_Boundary(t *testing.T) { for col := 0; col <= 0xFF; col++ { for alpha := 0; alpha <= 0xFF; alpha++ {