summaryrefslogtreecommitdiffstats
path: root/app/user.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-05-24 10:52:05 -0400
committerCorey Hulen <corey@hulen.com>2017-05-24 07:52:05 -0700
commit7ac8eaba925cb9f3d02bc93717cb3c573fd26ec2 (patch)
tree23024e2a10a2989d6cf87f3496a91ceccfe45a0b /app/user.go
parentb84891f654583f5ded287e1f5aa5de3c32be5044 (diff)
downloadchat-7ac8eaba925cb9f3d02bc93717cb3c573fd26ec2.tar.gz
chat-7ac8eaba925cb9f3d02bc93717cb3c573fd26ec2.tar.bz2
chat-7ac8eaba925cb9f3d02bc93717cb3c573fd26ec2.zip
PLT-6534 Rotated uploaded profile pictures to be upright (#6482)
Diffstat (limited to 'app/user.go')
-rw-r--r--app/user.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/user.go b/app/user.go
index 2a570c7ac..e5cc20568 100644
--- a/app/user.go
+++ b/app/user.go
@@ -805,6 +805,11 @@ func SetProfileImage(userId string, imageData *multipart.FileHeader) *model.AppE
return model.NewLocAppError("SetProfileImage", "api.user.upload_profile_user.decode.app_error", nil, err.Error())
}
+ file.Seek(0, 0)
+
+ orientation, _ := getImageOrientation(file)
+ img = makeImageUpright(img, orientation)
+
// Scale profile image
img = imaging.Fill(img, utils.Cfg.FileSettings.ProfileWidth, utils.Cfg.FileSettings.ProfileHeight, imaging.Center, imaging.Lanczos)