diff options
Diffstat (limited to 'src/pkg/image/decode_test.go')
| -rw-r--r-- | src/pkg/image/decode_test.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/pkg/image/decode_test.go b/src/pkg/image/decode_test.go index 540d5eda5..1b7db8bad 100644 --- a/src/pkg/image/decode_test.go +++ b/src/pkg/image/decode_test.go @@ -7,6 +7,7 @@ package image_test import ( "bufio" "image" + "image/color" "os" "testing" @@ -40,7 +41,7 @@ var imageTests = []imageTest{ {"testdata/video-005.gray.png", "testdata/video-005.gray.png", 0}, } -func decode(filename string) (image.Image, string, os.Error) { +func decode(filename string) (image.Image, string, error) { f, err := os.Open(filename) if err != nil { return nil, "", err @@ -49,7 +50,7 @@ func decode(filename string) (image.Image, string, os.Error) { return image.Decode(bufio.NewReader(f)) } -func decodeConfig(filename string) (image.Config, string, os.Error) { +func decodeConfig(filename string) (image.Config, string, error) { f, err := os.Open(filename) if err != nil { return image.Config{}, "", err @@ -66,7 +67,7 @@ func delta(u0, u1 uint32) int { return d } -func withinTolerance(c0, c1 image.Color, tolerance int) bool { +func withinTolerance(c0, c1 color.Color, tolerance int) bool { r0, g0, b0, a0 := c0.RGBA() r1, g1, b1, a1 := c1.RGBA() r := delta(r0, r1) @@ -82,7 +83,7 @@ loop: for _, it := range imageTests { g := golden[it.goldenFilename] if g == nil { - var err os.Error + var err error g, _, err = decode(it.goldenFilename) if err != nil { t.Errorf("%s: %v", it.goldenFilename, err) |