From f681781743087f73a0bbeb03ec870c13e9d15111 Mon Sep 17 00:00:00 2001
From: chai2010 <chaishushan@gmail.com>
Date: Thu, 23 Apr 2015 15:51:29 +0800
Subject: [PATCH] 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 @@ func Decode(r io.Reader) (img image.Image, err error) {
 				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
 				}