diff options
| author | Chris Lu <chris.lu@gmail.com> | 2017-05-28 10:25:40 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2017-05-28 10:25:40 -0700 |
| commit | 83efe1547d38acabf92ed53e7e31189eab992ed7 (patch) | |
| tree | a7b6971e44c45ee4cc8e1113d8166c3b3c4b4275 | |
| parent | 48919009fc54fc93c25ad21ce3a48d80b93d32e6 (diff) | |
| download | seaweedfs-83efe1547d38acabf92ed53e7e31189eab992ed7.tar.xz seaweedfs-83efe1547d38acabf92ed53e7e31189eab992ed7.zip | |
revert webp support due to "go test"0.76
related to https://github.com/chai2010/webp/issues/9
| -rw-r--r-- | weed/images/preprocess.go | 2 | ||||
| -rw-r--r-- | weed/images/resizing.go | 3 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers_read.go | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/weed/images/preprocess.go b/weed/images/preprocess.go index 4563df7f4..56f14eaa4 100644 --- a/weed/images/preprocess.go +++ b/weed/images/preprocess.go @@ -17,7 +17,7 @@ func MaybePreprocessImage(filename string, data []byte, width, height int) (resi ext := filepath.Ext(filename) ext = strings.ToLower(ext) switch ext { - case ".png", ".gif", ".webp": + case ".png", ".gif": return Resized(ext, data, width, height, "") case ".jpg", ".jpeg": data = FixJpgOrientation(data) diff --git a/weed/images/resizing.go b/weed/images/resizing.go index 5af8e45c9..0ea6b1777 100644 --- a/weed/images/resizing.go +++ b/weed/images/resizing.go @@ -6,7 +6,6 @@ import ( "image/gif" "image/jpeg" "image/png" - "github.com/chai2010/webp" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/disintegration/imaging" @@ -45,8 +44,6 @@ func Resized(ext string, data []byte, width, height int, mode string) (resized [ jpeg.Encode(&buf, dstImage, nil) case ".gif": gif.Encode(&buf, dstImage, nil) - case ".webp": - webp.Encode(&buf, dstImage, &webp.Options{Quality: 70}) } return buf.Bytes(), dstImage.Bounds().Dx(), dstImage.Bounds().Dy() } else { diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go index d457c77b9..8f50b265e 100644 --- a/weed/server/volume_server_handlers_read.go +++ b/weed/server/volume_server_handlers_read.go @@ -136,7 +136,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) } } } - if ext == ".png" || ext == ".jpg" || ext == ".gif"|| ext == ".webp" { + if ext == ".png" || ext == ".jpg" || ext == ".gif" { width, height := 0, 0 if r.FormValue("width") != "" { width, _ = strconv.Atoi(r.FormValue("width")) |