diff options
| author | zhangmingfeng <zhangmf2008@126.com> | 2018-07-05 10:34:17 +0800 |
|---|---|---|
| committer | zhangmingfeng <zhangmf2008@126.com> | 2018-07-05 10:34:17 +0800 |
| commit | 79d18c69b4ba68e6fb84893ff7b43027b4db5387 (patch) | |
| tree | e99ad2cf4bd957aec720d56fc3769fc57a482c2a /weed/images/preprocess.go | |
| parent | 77fc8c59140537bb693ccf44c63e68626322b70e (diff) | |
| download | seaweedfs-79d18c69b4ba68e6fb84893ff7b43027b4db5387.tar.xz seaweedfs-79d18c69b4ba68e6fb84893ff7b43027b4db5387.zip | |
增加chunk图片文件支持width和height
Diffstat (limited to 'weed/images/preprocess.go')
| -rw-r--r-- | weed/images/preprocess.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/weed/images/preprocess.go b/weed/images/preprocess.go index 56f14eaa4..0cfb66c6b 100644 --- a/weed/images/preprocess.go +++ b/weed/images/preprocess.go @@ -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 } |
