From 26aabeb6d5d271a76a1d85f853a27de5964dbaaf Mon Sep 17 00:00:00 2001
From: "Sascha L. Teichmann" <sascha.teichmann@intevation.de>
Date: Wed, 10 Sep 2014 17:33:13 +0200
Subject: [PATCH] Fixed closing zlib decompressor in error case. Added missing
 header.

---
 tilemapper/blockdecoder.go | 5 +++--
 tilemapper/client.go       | 4 ++++
 tilemapper/main.go         | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tilemapper/blockdecoder.go b/tilemapper/blockdecoder.go
index 3edefa9..3e6ffe2 100644
--- a/tilemapper/blockdecoder.go
+++ b/tilemapper/blockdecoder.go
@@ -61,10 +61,11 @@ func NewDecodedBlock(data []byte, nameIndex map[string]int) (db *DecodedBlock, e
 	}
 
 	var mapContent []byte
-	if mapContent, err = ioutil.ReadAll(zr); err != nil {
+	mapContent, err = ioutil.ReadAll(zr)
+	zr.Close()
+	if err != nil {
 		return
 	}
-	zr.Close()
 
 	if uncompressedLen != len(mapContent) {
 		err = ErrMapContentSizeMismatch
diff --git a/tilemapper/client.go b/tilemapper/client.go
index 5891d07..99515dc 100644
--- a/tilemapper/client.go
+++ b/tilemapper/client.go
@@ -1,3 +1,7 @@
+// Copyright 2014 by Sascha L. Teichmann
+// Use of this source code is governed by the MIT license
+// that can be found in the LICENSE file.
+
 package main
 
 import (
diff --git a/tilemapper/main.go b/tilemapper/main.go
index e9df17f..938867d 100644
--- a/tilemapper/main.go
+++ b/tilemapper/main.go
@@ -83,6 +83,7 @@ func main() {
 	fmt.Printf("num of blocks: %d\n", numBlocks)
 	fmt.Printf("num of bytes: %d\n", bytesTotal)
 
+	fmt.Println("uses block versions:")
 	for version, count := range versions {
 		fmt.Printf("%d: %d\n", version, count)
 	}