From: Robert Griesemer <gri@golang.org>
Date: Tue, 16 Mar 2010 05:10:47 +0000 (-0700)
Subject: image/jpeg: fix typos
X-Git-Tag: weekly.2010-03-22~47
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=926f59ba140620b6a73c5a1ff1d87e626cf38f53;p=gostls13.git

image/jpeg: fix typos

Fixes #665.

R=nigeltao, nigeltao_golang
CC=golang-dev
https://golang.org/cl/570041
---

diff --git a/src/pkg/image/jpeg/reader.go b/src/pkg/image/jpeg/reader.go
index 22c7a1fb06..ec036ef4d6 100644
--- a/src/pkg/image/jpeg/reader.go
+++ b/src/pkg/image/jpeg/reader.go
@@ -375,7 +375,7 @@ func Decode(r io.Reader) (image.Image, os.Error) {
 	}
 
 	// Check for the Start Of Image marker.
-	_, err := io.ReadFull(r, d.tmp[0:2])
+	_, err := io.ReadFull(d.r, d.tmp[0:2])
 	if err != nil {
 		return nil, err
 	}
@@ -385,7 +385,7 @@ func Decode(r io.Reader) (image.Image, os.Error) {
 
 	// Process the remaining segments until the End Of Image marker.
 	for {
-		_, err := io.ReadFull(r, d.tmp[0:2])
+		_, err := io.ReadFull(d.r, d.tmp[0:2])
 		if err != nil {
 			return nil, err
 		}
@@ -399,7 +399,7 @@ func Decode(r io.Reader) (image.Image, os.Error) {
 
 		// Read the 16-bit length of the segment. The value includes the 2 bytes for the
 		// length itself, so we subtract 2 to get the number of remaining bytes.
-		_, err = io.ReadFull(r, d.tmp[0:2])
+		_, err = io.ReadFull(d.r, d.tmp[0:2])
 		if err != nil {
 			return nil, err
 		}