gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

fix image serving performance problem introduced in last release.

Browse source
This commit is contained in:
Chris Lu 2014-05-07 12:52:42 -07:00
parent 729716ab7a
commit 1c30a780a7
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
go/weed/weed_server/volume_server_handlers.go
View file

@ -125,15 +125,15 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request,
} }
} }
if ext == ".png" || ext == ".jpg" || ext == ".gif" { if ext == ".png" || ext == ".jpg" || ext == ".gif" {
if srcImage, _, err := image.Decode(bytes.NewReader(n.Data)); err == nil { width, height := 0, 0
width, height := 0, 0 if r.FormValue("width") != "" {
if r.FormValue("width") != "" { width, _ = strconv.Atoi(r.FormValue("width"))
width, _ = strconv.Atoi(r.FormValue("width")) }
} if r.FormValue("height") != "" {
if r.FormValue("height") != "" { height, _ = strconv.Atoi(r.FormValue("height"))
height, _ = strconv.Atoi(r.FormValue("height")) }
} if width != 0 || height != 0 {
if width != 0 || height != 0 { if srcImage, _, err := image.Decode(bytes.NewReader(n.Data)); err == nil {
bounds := srcImage.Bounds() bounds := srcImage.Bounds()
var dstImage *image.NRGBA var dstImage *image.NRGBA
if width == height && bounds.Dx() != bounds.Dy() { if width == height && bounds.Dx() != bounds.Dy() {