gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nil if not images

Browse Source
This commit is contained in:
Chris Lu
2018-07-24 00:49:53 -07:00
parent a9069520ae
commit 5a237af973
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
weed/server/volume_server_handlers_read.go
View File

@@ -136,6 +136,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
} }
} }
var rs io.ReadSeeker var rs io.ReadSeeker
rs = bytes.NewReader(n.Data)
if ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif" { if ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif" {
width, height := 0, 0 width, height := 0, 0
if r.FormValue("width") != "" { if r.FormValue("width") != "" {
@@ -144,7 +145,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
if r.FormValue("height") != "" { if r.FormValue("height") != "" {
height, _ = strconv.Atoi(r.FormValue("height")) height, _ = strconv.Atoi(r.FormValue("height"))
} }
rs, _, _ = images.Resized(ext, bytes.NewReader(n.Data), width, height, r.FormValue("mode")) rs, _, _ = images.Resized(ext, rs, width, height, r.FormValue("mode"))
} }
if e := writeResponseContent(filename, mtype, rs, w, r); e != nil { if e := writeResponseContent(filename, mtype, rs, w, r); e != nil {