lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-14 23:26:19 +08:00
Code Issues 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
*
*/
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)
switch ext {
case ".png", ".gif":
@@ -21,5 +21,5 @@ func MaybePreprocessImage(filename string, data []byte, width, height int) (resi
data = FixJpgOrientation(data)
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"
)
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 {
return data
return data, 0, 0
}
if srcImage, _, err := image.Decode(bytes.NewReader(data)); err == nil {
bounds := srcImage.Bounds()
var dstImage *image.NRGBA
if width == height && bounds.Dx() != bounds.Dy() {
dstImage = imaging.Thumbnail(srcImage, width, height, imaging.Lanczos)
} else {
dstImage = imaging.Resize(srcImage, width, height, imaging.Lanczos)
if bounds.Dx() > width && width != 0 || bounds.Dy() > height && height != 0 {
if width == height && bounds.Dx() != bounds.Dy() {
dstImage = imaging.Thumbnail(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
switch ext {
@@ -30,7 +35,7 @@ func Resized(ext string, data []byte, width, height int) (resized []byte) {
case ".gif":
gif.Encode(&buf, dstImage, nil)
}
return buf.Bytes()
return buf.Bytes(), dstImage.Bounds().Dx(), dstImage.Bounds().Dy()
}
return data
return data, 0, 0
}