comparison pkg/octree/loader.go @ 1692:f4dcbe8941a1

Octree: Resolved the remaing golint issues with this package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 31 Dec 2018 11:13:49 +0100
parents de09bd3b5c05
children 86c7a023400e
comparison
equal deleted inserted replaced
1691:de09bd3b5c05 1692:f4dcbe8941a1
16 import ( 16 import (
17 "bufio" 17 "bufio"
18 "bytes" 18 "bytes"
19 "encoding/binary" 19 "encoding/binary"
20 "log" 20 "log"
21 "os"
22 21
23 "github.com/golang/snappy" 22 "github.com/golang/snappy"
24 ) 23 )
25 24
26 func loadReader(r *bufio.Reader) (*Tree, error) { 25 func loadReader(r *bufio.Reader) (*Tree, error) {
110 } 109 }
111 110
112 return tree, nil 111 return tree, nil
113 } 112 }
114 113
115 func LoadTree(fname string) (*Tree, error) { 114 func deserialize(data []byte) (*Tree, error) {
116
117 f, err := os.Open(fname)
118 if err != nil {
119 return nil, err
120 }
121 defer f.Close()
122 return loadReader(
123 bufio.NewReader(
124 snappy.NewReader(f)))
125 }
126
127 func Deserialize(data []byte) (*Tree, error) {
128 return loadReader( 115 return loadReader(
129 bufio.NewReader( 116 bufio.NewReader(
130 snappy.NewReader( 117 snappy.NewReader(
131 bytes.NewReader(data)))) 118 bytes.NewReader(data))))
132 } 119 }