diff options
| author | Nigel Tao <nigeltao@golang.org> | 2010-09-21 16:13:19 +1000 |
|---|---|---|
| committer | Nigel Tao <nigeltao@golang.org> | 2010-09-21 16:13:19 +1000 |
| commit | bd77a889e687f0ddf4c6c40c25ab45b7e9c797f9 (patch) | |
| tree | 8833c7efd4eb0346c86016be6206ac4113ef447b | |
| parent | c20e024df3d7ecd84572184d53a9848d36ab85d1 (diff) | |
| download | go-bd77a889e687f0ddf4c6c40c25ab45b7e9c797f9.tar.xz | |
exp/nacl/av: update color to max out at 1<<16-1 instead of 1<<32-1.
Fix missing return in Set(x, y, color).
R=r
CC=golang-dev
https://golang.org/cl/2256042
| -rw-r--r-- | src/pkg/exp/nacl/av/image.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pkg/exp/nacl/av/image.go b/src/pkg/exp/nacl/av/image.go index 4c4c558c1c..2ff4bb69c1 100644 --- a/src/pkg/exp/nacl/av/image.go +++ b/src/pkg/exp/nacl/av/image.go @@ -36,6 +36,7 @@ func (m *Image) At(x, y int) image.Color { return m.Pixel[y][x] } func (m *Image) Set(x, y int, color image.Color) { if c, ok := color.(Color); ok { m.Pixel[y][x] = c + return } m.Pixel[y][x] = makeColor(color.RGBA()) } @@ -69,7 +70,7 @@ func (p Color) RGBA() (r, g, b, a uint32) { } func makeColor(r, g, b, a uint32) Color { - return Color(a>>24<<24 | r>>24<<16 | g>>24<<8 | b>>24) + return Color(a>>8<<24 | r>>8<<16 | g>>8<<8 | b>>8) } func toColor(color image.Color) image.Color { |