commit f681781743087f73a0bbeb03ec870c13e9d15111
author chai2010 <chaishushan@gmail.com> Thu Apr 23 15:51:29 2015 +0800
committer Nigel Tao <nigeltao@golang.org> Fri Apr 24 01:40:59 2015 +0000
tree b8e2d76c0ff72feac1dc9605dfd27b59ff51d340
parent 24b0de15f1ec0a9d5e64d58b91b166bd45cfe4bc

tiff: fix shadowed err variable.

Fixes golang/go#10395

Change-Id: Ice768df7bb0bdac979d49328bfdf0d6713a1e7c3
Reviewed-on: https://go-review.googlesource.com/9264
Reviewed-by: Nigel Tao <nigeltao@golang.org>

tiff/reader.go

diff --git a/tiff/reader.go b/tiff/reader.go
index 2cad90d..66acb0d 100644
--- a/tiff/reader.go
+++ b/tiff/reader.go
@@ -571,7 +571,8 @@
 				d.buf, err = ioutil.ReadAll(r)
 				r.Close()
 			case cDeflate, cDeflateOld:
-				r, err := zlib.NewReader(io.NewSectionReader(d.r, offset, n))
+				var r io.ReadCloser
+				r, err = zlib.NewReader(io.NewSectionReader(d.r, offset, n))
 				if err != nil {
 					return nil, err
 				}