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

return image size when client image processing

Browse Source
This commit is contained in:
Chris Lu
2014-07-05 00:43:41 -07:00
parent fd9f924ad7
commit 38231b6891
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/images/preprocess.go
View File

@@ -12,7 +12,7 @@ import (
* Call this function on any file uploaded to weedfs * Call this function on any file uploaded to weedfs
* *
*/ */
func MaybePreprocessImage(filename string, data []byte, width, height int) (resized []byte) { func MaybePreprocessImage(filename string, data []byte, width, height int) (resized []byte, w int, h int) {
ext := filepath.Ext(filename) ext := filepath.Ext(filename)
switch ext { switch ext {
case ".png", ".gif": case ".png", ".gif":
@@ -21,5 +21,5 @@ func MaybePreprocessImage(filename string, data []byte, width, height int) (resi
data = FixJpgOrientation(data) data = FixJpgOrientation(data)
return Resized(ext, data, width, height) return Resized(ext, data, width, height)
} }
return data return data, 0, 0
} }

21
go/images/resizing.go
View File

@@ -9,17 +9,22 @@ import (
"image/png" "image/png"
) )
func Resized(ext string, data []byte, width, height int) (resized []byte) { func Resized(ext string, data []byte, width, height int) (resized []byte, w int, h int) {
if width == 0 && height == 0 { if width == 0 && height == 0 {
return data return data, 0, 0
} }
if srcImage, _, err := image.Decode(bytes.NewReader(data)); err == nil { if srcImage, _, err := image.Decode(bytes.NewReader(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 bounds.Dx() > width && width != 0 || bounds.Dy() > height && height != 0 {
dstImage = imaging.Thumbnail(srcImage, width, height, imaging.Lanczos) if width == height && bounds.Dx() != bounds.Dy() {
} else { dstImage = imaging.Thumbnail(srcImage, width, height, imaging.Lanczos)
dstImage = imaging.Resize(srcImage, width, height, imaging.Lanczos) w, h = width, height
} else {
dstImage = imaging.Resize(srcImage, width, height, imaging.Lanczos)
}
}else{
return data, bounds.Dx(), bounds.Dy()
} }
var buf bytes.Buffer var buf bytes.Buffer
switch ext { switch ext {
@@ -30,7 +35,7 @@ func Resized(ext string, data []byte, width, height int) (resized []byte) {
case ".gif": case ".gif":
gif.Encode(&buf, dstImage, nil) gif.Encode(&buf, dstImage, nil)
} }
return buf.Bytes() return buf.Bytes(), dstImage.Bounds().Dx(), dstImage.Bounds().Dy()
} }
return data return data, 0, 0
} }

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

@@ -132,7 +132,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"))
} }
n.Data = images.Resized(ext, n.Data, width, height) n.Data, _, _ = images.Resized(ext, n.Data, width, height)
} }
w.Header().Set("Accept-Ranges", "bytes") w.Header().Set("Accept-Ranges", "bytes")