qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 10:14:40 -07:00
Code Releases Activity

image: another build fix regarding ColorImage.

Browse Source 
R=adg
TBR=adg
CC=golang-dev
https://golang.org/cl/2449041
This commit is contained in:
Nigel Tao 2010-10-12 14:33:37 +11:00
parent cd0a75f3d7
commit a3e971d355
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pkg/exp/4s/xs.go
View File

@ -144,17 +144,17 @@ var txbits = [NCOL][32]byte{
}, },
} }
var txpix = [NCOL]image.ColorImage{ var txpix = [NCOL]image.Image{
image.ColorImage{image.RGBAColor{0xFF, 0xFF, 0x00, 0xFF}}, /* yellow */ image.NewColorImage(image.RGBAColor{0xFF, 0xFF, 0x00, 0xFF}), /* yellow */
image.ColorImage{image.RGBAColor{0x00, 0xFF, 0xFF, 0xFF}}, /* cyan */ image.NewColorImage(image.RGBAColor{0x00, 0xFF, 0xFF, 0xFF}), /* cyan */
image.ColorImage{image.RGBAColor{0x00, 0xFF, 0x00, 0xFF}}, /* lime green */ image.NewColorImage(image.RGBAColor{0x00, 0xFF, 0x00, 0xFF}), /* lime green */
image.ColorImage{image.RGBAColor{0x00, 0x5D, 0xBB, 0xFF}}, /* slate */ image.NewColorImage(image.RGBAColor{0x00, 0x5D, 0xBB, 0xFF}), /* slate */
image.ColorImage{image.RGBAColor{0xFF, 0x00, 0x00, 0xFF}}, /* red */ image.NewColorImage(image.RGBAColor{0xFF, 0x00, 0x00, 0xFF}), /* red */
image.ColorImage{image.RGBAColor{0x55, 0xAA, 0xAA, 0xFF}}, /* olive green */ image.NewColorImage(image.RGBAColor{0x55, 0xAA, 0xAA, 0xFF}), /* olive green */
image.ColorImage{image.RGBAColor{0x00, 0x00, 0xFF, 0xFF}}, /* blue */ image.NewColorImage(image.RGBAColor{0x00, 0x00, 0xFF, 0xFF}), /* blue */
image.ColorImage{image.RGBAColor{0xFF, 0x55, 0xAA, 0xFF}}, /* pink */ image.NewColorImage(image.RGBAColor{0xFF, 0x55, 0xAA, 0xFF}), /* pink */
image.ColorImage{image.RGBAColor{0xFF, 0xAA, 0xFF, 0xFF}}, /* lavender */ image.NewColorImage(image.RGBAColor{0xFF, 0xAA, 0xFF, 0xFF}), /* lavender */
image.ColorImage{image.RGBAColor{0xBB, 0x00, 0x5D, 0xFF}}, /* maroon */ image.NewColorImage(image.RGBAColor{0xBB, 0x00, 0x5D, 0xFF}), /* maroon */
} }
func movemouse() int { func movemouse() int {
@ -735,7 +735,7 @@ func Play(pp []Piece, ctxt draw.Window) {
N = len(pieces[0].d) N = len(pieces[0].d)
initPieces() initPieces()
rand.Seed(int64(time.Nanoseconds() % (1e9 - 1))) rand.Seed(int64(time.Nanoseconds() % (1e9 - 1)))
whitemask = image.ColorImage{image.AlphaColor{0x7F}} whitemask = image.NewColorImage(image.AlphaColor{0x7F})
tsleep = 50 tsleep = 50
timerc = time.Tick(int64(tsleep/2) * 1e6) timerc = time.Tick(int64(tsleep/2) * 1e6)
suspc = make(chan bool) suspc = make(chan bool)

8
src/pkg/image/names.go
View File

@ -6,13 +6,13 @@ package image
var ( var (
// Black is an opaque black ColorImage. // Black is an opaque black ColorImage.
Black = ColorImage{Gray16Color{0}} Black = NewColorImage(Gray16Color{0})
// White is an opaque white ColorImage. // White is an opaque white ColorImage.
White = ColorImage{Gray16Color{0xffff}} White = NewColorImage(Gray16Color{0xffff})
// Transparent is a fully transparent ColorImage. // Transparent is a fully transparent ColorImage.
Transparent = ColorImage{Alpha16Color{0}} Transparent = NewColorImage(Alpha16Color{0})
// Opaque is a fully opaque ColorImage. // Opaque is a fully opaque ColorImage.
Opaque = ColorImage{Alpha16Color{0xffff}} Opaque = NewColorImage(Alpha16Color{0xffff})
) )
// A ColorImage is a practically infinite-sized Image of uniform Color. // A ColorImage is a practically infinite-sized Image of uniform Color.