diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-12-21 22:23:23 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-12-21 22:23:23 +0000 |
| commit | 5c167ca0a208115ab6c8496946a2d9c208d8d859 (patch) | |
| tree | cf96cd27ec81f37394a138f6e77fc0e662004482 /libgo | |
| parent | 9f9957da5e219dec8a4b4580a8a416a6861cf8e6 (diff) | |
| download | gcc-5c167ca0a208115ab6c8496946a2d9c208d8d859.zip gcc-5c167ca0a208115ab6c8496946a2d9c208d8d859.tar.gz gcc-5c167ca0a208115ab6c8496946a2d9c208d8d859.tar.bz2 | |
compiler: Error if name defined in both package and file blocks.
From-SVN: r194685
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/go/image/image_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libgo/go/image/image_test.go b/libgo/go/image/image_test.go index 2b3f149..2656757 100644 --- a/libgo/go/image/image_test.go +++ b/libgo/go/image/image_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -type image interface { +type timage interface { Image Opaque() bool Set(int, int, color.Color) @@ -24,7 +24,7 @@ func cmp(t *testing.T, cm color.Model, c0, c1 color.Color) bool { } func TestImage(t *testing.T) { - testImage := []image{ + testImage := []timage{ NewRGBA(Rect(0, 0, 10, 10)), NewRGBA64(Rect(0, 0, 10, 10)), NewNRGBA(Rect(0, 0, 10, 10)), @@ -52,11 +52,11 @@ func TestImage(t *testing.T) { t.Errorf("%T: at (6, 3), want a non-zero color, got %v", m, m.At(6, 3)) continue } - if !m.SubImage(Rect(6, 3, 7, 4)).(image).Opaque() { + if !m.SubImage(Rect(6, 3, 7, 4)).(timage).Opaque() { t.Errorf("%T: at (6, 3) was not opaque", m) continue } - m = m.SubImage(Rect(3, 2, 9, 8)).(image) + m = m.SubImage(Rect(3, 2, 9, 8)).(timage) if !Rect(3, 2, 9, 8).Eq(m.Bounds()) { t.Errorf("%T: sub-image want bounds %v, got %v", m, Rect(3, 2, 9, 8), m.Bounds()) continue @@ -97,7 +97,7 @@ func Test16BitsPerColorChannel(t *testing.T) { continue } } - testImage := []image{ + testImage := []timage{ NewRGBA64(Rect(0, 0, 10, 10)), NewNRGBA64(Rect(0, 0, 10, 10)), NewAlpha16(Rect(0, 0, 10, 10)), |