diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-03-02 16:38:43 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-03-02 16:38:43 +0000 |
| commit | cbb6491d76c7aa81cdf5d3b3a81386129c5e2fce (patch) | |
| tree | efa0c55763b34cbc633bc494c2743d1b5d9aaff3 /libgo/go/image | |
| parent | ff2f581b00ac6759f6366c16ef902c935163aa13 (diff) | |
| download | gcc-cbb6491d76c7aa81cdf5d3b3a81386129c5e2fce.zip gcc-cbb6491d76c7aa81cdf5d3b3a81386129c5e2fce.tar.gz gcc-cbb6491d76c7aa81cdf5d3b3a81386129c5e2fce.tar.bz2 | |
libgo: Update to weekly.2012-02-14 release.
From-SVN: r184798
Diffstat (limited to 'libgo/go/image')
| -rw-r--r-- | libgo/go/image/png/reader_test.go | 2 | ||||
| -rw-r--r-- | libgo/go/image/png/writer.go | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/libgo/go/image/png/reader_test.go b/libgo/go/image/png/reader_test.go index 7eb1fc2..24c4ea4 100644 --- a/libgo/go/image/png/reader_test.go +++ b/libgo/go/image/png/reader_test.go @@ -246,7 +246,7 @@ var readerErrors = []struct { file string err string }{ - {"invalid-zlib.png", "zlib checksum error"}, + {"invalid-zlib.png", "zlib: invalid checksum"}, {"invalid-crc32.png", "invalid checksum"}, {"invalid-noend.png", "unexpected EOF"}, {"invalid-trunc.png", "unexpected EOF"}, diff --git a/libgo/go/image/png/writer.go b/libgo/go/image/png/writer.go index 286a3bc..57c0379 100644 --- a/libgo/go/image/png/writer.go +++ b/libgo/go/image/png/writer.go @@ -263,10 +263,7 @@ func filter(cr *[nFilter][]byte, pr []byte, bpp int) int { } func writeImage(w io.Writer, m image.Image, cb int) error { - zw, err := zlib.NewWriter(w) - if err != nil { - return err - } + zw := zlib.NewWriter(w) defer zw.Close() bpp := 0 // Bytes per pixel. @@ -391,8 +388,7 @@ func writeImage(w io.Writer, m image.Image, cb int) error { f := filter(&cr, pr, bpp) // Write the compressed bytes. - _, err = zw.Write(cr[f]) - if err != nil { + if _, err := zw.Write(cr[f]); err != nil { return err } |