aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2011-06-07 12:19:36 +0000
committerRob Pike <r@golang.org>2011-06-07 12:19:36 +0000
commit05348ab0c84a7e2c76864a156993ac7f4ed092cd (patch)
tree4777af402ba05e72e8a5f3553c9fbb03427769f2
parent4881e7744ab3f125a60fda1d32583dcb59f9d817 (diff)
downloadgo-05348ab0c84a7e2c76864a156993ac7f4ed092cd.tar.gz
go-05348ab0c84a7e2c76864a156993ac7f4ed092cd.zip
image/gif: fix buglet in graphics extension.
need to ReadFull, not Read, to get extension data. R=nigeltao CC=golang-dev https://golang.org/cl/4576043
-rw-r--r--src/pkg/image/gif/reader.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pkg/image/gif/reader.go b/src/pkg/image/gif/reader.go
index 9f7296a98b..26c013b9ab 100644
--- a/src/pkg/image/gif/reader.go
+++ b/src/pkg/image/gif/reader.go
@@ -274,7 +274,7 @@ func (d *decoder) readExtension() os.Error {
return fmt.Errorf("gif: unknown extension 0x%.2x", extension)
}
if size > 0 {
- if _, err := d.r.Read(d.tmp[0:size]); err != nil {
+ if _, err := io.ReadFull(d.r, d.tmp[0:size]); err != nil {
return err
}
}
@@ -406,8 +406,8 @@ func DecodeAll(r io.Reader) (*GIF, os.Error) {
return gif, nil
}
-// DecodeConfig returns the color model and dimensions of a GIF image without
-// decoding the entire image.
+// DecodeConfig returns the global color model and dimensions of a GIF image
+// without decoding the entire image.
func DecodeConfig(r io.Reader) (image.Config, os.Error) {
var d decoder
if err := d.decode(r, true); err != nil {