gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages 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
Download Patch File Download Diff File Expand all files Collapse all files

2
go/weed/weed_server/volume_server_handlers.go
View File

@@ -125,7 +125,6 @@ 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"))
@@ -134,6 +133,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request,
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() {