Merge pull request #195 from mattermost/revert-181-mm1494

Revert "MM-1494 Change image resizing for preview and thumbnail to us…
Этот коммит содержится в:
Joram Wilander
2015-07-16 09:06:37 -04:00
родитель d16a1d6d75 288ad55f80
Коммит 3e31a9383d

Просмотреть файл

@@ -13,9 +13,9 @@ import (
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils" "github.com/mattermost/platform/utils"
"github.com/nfnt/resize" "github.com/nfnt/resize"
_ "golang.org/x/image/bmp"
"image" "image"
_ "image/gif" _ "image/gif"
_ "golang.org/x/image/bmp"
"image/jpeg" "image/jpeg"
"io" "io"
"net/http" "net/http"
@@ -157,7 +157,7 @@ func fireAndForgetHandleImages(filenames []string, fileData [][]byte, teamId, ch
go func() { go func() {
var thumbnail image.Image var thumbnail image.Image
if imgConfig.Width > int(utils.Cfg.ImageSettings.ThumbnailWidth) { if imgConfig.Width > int(utils.Cfg.ImageSettings.ThumbnailWidth) {
thumbnail = resize.Resize(utils.Cfg.ImageSettings.ThumbnailWidth, utils.Cfg.ImageSettings.ThumbnailHeight, img, resize.Lanczos3) thumbnail = resize.Resize(utils.Cfg.ImageSettings.ThumbnailWidth, utils.Cfg.ImageSettings.ThumbnailHeight, img, resize.NearestNeighbor)
} else { } else {
thumbnail = img thumbnail = img
} }
@@ -182,7 +182,7 @@ func fireAndForgetHandleImages(filenames []string, fileData [][]byte, teamId, ch
go func() { go func() {
var preview image.Image var preview image.Image
if imgConfig.Width > int(utils.Cfg.ImageSettings.PreviewWidth) { if imgConfig.Width > int(utils.Cfg.ImageSettings.PreviewWidth) {
preview = resize.Resize(utils.Cfg.ImageSettings.PreviewWidth, utils.Cfg.ImageSettings.PreviewHeight, img, resize.Lanczos3) preview = resize.Resize(utils.Cfg.ImageSettings.PreviewWidth, utils.Cfg.ImageSettings.PreviewHeight, img, resize.NearestNeighbor)
} else { } else {
preview = img preview = img
} }