diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-07-24 00:49:53 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-07-24 00:49:53 -0700 |
| commit | 5a237af973f09b67dbe8932cf1d794d837ff0758 (patch) | |
| tree | 01edb9f3a8a9edce948140355a763c9d4a178b5d | |
| parent | a9069520aec5adc76122ac629c9cdf70e0c33768 (diff) | |
| download | seaweedfs-5a237af973f09b67dbe8932cf1d794d837ff0758.tar.xz seaweedfs-5a237af973f09b67dbe8932cf1d794d837ff0758.zip | |
fix nil if not images
| -rw-r--r-- | weed/server/volume_server_handlers_read.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go index 734291a36..9f2a46910 100644 --- a/weed/server/volume_server_handlers_read.go +++ b/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 { |