summaryrefslogtreecommitdiffstats
path: root/app/file.go
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-06-29 22:39:57 +0800
committerHarrison Healey <harrisonmhealey@gmail.com>2017-06-29 10:39:57 -0400
commit648f333850163efeac486c4b07eb47da415a9c98 (patch)
tree1b441666d3a58f39efb0cb5396ede217ed841c9a /app/file.go
parente1168ab7cc9770ab71fda6994ee80ef0e64e15d7 (diff)
downloadchat-648f333850163efeac486c4b07eb47da415a9c98.tar.gz
chat-648f333850163efeac486c4b07eb47da415a9c98.tar.bz2
chat-648f333850163efeac486c4b07eb47da415a9c98.zip
[PLT-6496] Remove System Console and config settings for image height and width (#6688)
* remove System Console and config settings for image height and width * add constants and update config.json * updated as per review
Diffstat (limited to 'app/file.go')
-rw-r--r--app/file.go23
1 files changed, 11 insertions, 12 deletions
diff --git a/app/file.go b/app/file.go
index f46dd50ec..9786ba961 100644
--- a/app/file.go
+++ b/app/file.go
@@ -53,7 +53,10 @@ const (
RotatedCCWMirrored = 7
RotatedCW = 8
- MaxImageSize = 6048 * 4032 // 24 megapixels, roughly 36MB as a raw image
+ MaxImageSize = 6048 * 4032 // 24 megapixels, roughly 36MB as a raw image
+ IMAGE_THUMBNAIL_PIXEL_WIDTH = 120
+ IMAGE_THUMBNAIL_PIXEL_HEIGTH = 100
+ IMAGE_PREVIEW_PIXEL_WIDTH = 1024
)
// Similar to s3.New() but allows initialization of signature v2 or signature v4 client.
@@ -553,18 +556,13 @@ func getImageOrientation(input io.Reader) (int, error) {
}
func generateThumbnailImage(img image.Image, thumbnailPath string, width int, height int) {
- thumbWidth := float64(utils.Cfg.FileSettings.ThumbnailWidth)
- thumbHeight := float64(utils.Cfg.FileSettings.ThumbnailHeight)
- imgWidth := float64(width)
- imgHeight := float64(height)
-
var thumbnail image.Image
- if imgHeight < thumbHeight && imgWidth < thumbWidth {
+ if height < IMAGE_THUMBNAIL_PIXEL_HEIGTH && width < IMAGE_THUMBNAIL_PIXEL_WIDTH {
thumbnail = img
- } else if imgHeight/imgWidth < thumbHeight/thumbWidth {
- thumbnail = imaging.Resize(img, 0, utils.Cfg.FileSettings.ThumbnailHeight, imaging.Lanczos)
+ } else if height/width < IMAGE_THUMBNAIL_PIXEL_HEIGTH/IMAGE_THUMBNAIL_PIXEL_WIDTH {
+ thumbnail = imaging.Resize(img, 0, IMAGE_THUMBNAIL_PIXEL_HEIGTH, imaging.Lanczos)
} else {
- thumbnail = imaging.Resize(img, utils.Cfg.FileSettings.ThumbnailWidth, 0, imaging.Lanczos)
+ thumbnail = imaging.Resize(img, IMAGE_THUMBNAIL_PIXEL_WIDTH, 0, imaging.Lanczos)
}
buf := new(bytes.Buffer)
@@ -581,8 +579,9 @@ func generateThumbnailImage(img image.Image, thumbnailPath string, width int, he
func generatePreviewImage(img image.Image, previewPath string, width int) {
var preview image.Image
- if width > int(utils.Cfg.FileSettings.PreviewWidth) {
- preview = imaging.Resize(img, utils.Cfg.FileSettings.PreviewWidth, utils.Cfg.FileSettings.PreviewHeight, imaging.Lanczos)
+
+ if width > IMAGE_PREVIEW_PIXEL_WIDTH {
+ preview = imaging.Resize(img, IMAGE_PREVIEW_PIXEL_WIDTH, 0, imaging.Lanczos)
} else {
preview = img
}