lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-19 10:28:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

增加chunk图片文件支持width和height

Browse Source
This commit is contained in:
zhangmingfeng
2018-07-05 10:34:17 +08:00
parent 77fc8c5914
commit 79d18c69b4
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
weed/images/preprocess.go
View File

@@ -3,6 +3,8 @@ package images
import (
"path/filepath"
"strings"
"bytes"
"io"
)
/*
@@ -13,15 +15,15 @@ import (
* Call this function on any file uploaded to SeaweedFS
*
*/
func MaybePreprocessImage(filename string, data []byte, width, height int) (resized []byte, w int, h int) {
func MaybePreprocessImage(filename string, data []byte, width, height int) (resized io.ReadSeeker, w int, h int) {
ext := filepath.Ext(filename)
ext = strings.ToLower(ext)
switch ext {
case ".png", ".gif":
return Resized(ext, data, width, height, "")
return Resized(ext, bytes.NewReader(data), width, height, "")
case ".jpg", ".jpeg":
data = FixJpgOrientation(data)
return Resized(ext, data, width, height, "")
return Resized(ext, bytes.NewReader(data), width, height, "")
}
return data, 0, 0
return bytes.NewReader(data), 0, 0
}

13
weed/images/resizing.go
View File

@@ -9,13 +9,14 @@ import (
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/disintegration/imaging"
"io"
)
func Resized(ext string, data []byte, width, height int, mode string) (resized []byte, w int, h int) {
func Resized(ext string, read io.ReadSeeker, width, height int, mode string) (resized io.ReadSeeker, w int, h int) {
if width == 0 && height == 0 {
return data, 0, 0
return read, 0, 0
}
srcImage, _, err := image.Decode(bytes.NewReader(data))
srcImage, _, err := image.Decode(read)
if err == nil {
bounds := srcImage.Bounds()
var dstImage *image.NRGBA
@@ -34,7 +35,7 @@ func Resized(ext string, data []byte, width, height int, mode string) (resized [
}
}
} else {
return data, bounds.Dx(), bounds.Dy()
return read, bounds.Dx(), bounds.Dy()
}
var buf bytes.Buffer
switch ext {
@@ -45,9 +46,9 @@ func Resized(ext string, data []byte, width, height int, mode string) (resized [
case ".gif":
gif.Encode(&buf, dstImage, nil)
}
return buf.Bytes(), dstImage.Bounds().Dx(), dstImage.Bounds().Dy()
return bytes.NewReader(buf.Bytes()), dstImage.Bounds().Dx(), dstImage.Bounds().Dy()
} else {
glog.Error(err)
}
return data, 0, 0
return read, 0, 0
}