Browse Source

fix nil if not images

pull/697/head
Chris Lu 7 years ago
parent
commit
5a237af973
  1. 3
      weed/server/volume_server_handlers_read.go

3
weed/server/volume_server_handlers_read.go

@ -136,6 +136,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
}
}
var rs io.ReadSeeker
rs = bytes.NewReader(n.Data)
if ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif" {
width, height := 0, 0
if r.FormValue("width") != "" {
@ -144,7 +145,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
if 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 {

Loading…
Cancel
Save