Merge pull request #695 from zhangmingfeng/master

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

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
 }