Commit 7ac8eaba authored by Harrison Healey's avatar Harrison Healey Committed by Corey Hulen

PLT-6534 Rotated uploaded profile pictures to be upright (#6482)

parent b84891f6
......@@ -495,30 +495,35 @@ func prepareImage(fileData []byte) (*image.Image, int, int) {
}
// Flip the image to be upright
orientation, _ := getImageOrientation(fileData)
orientation, _ := getImageOrientation(bytes.NewReader(fileData))
img = makeImageUpright(img, orientation)
return &img, width, height
}
func makeImageUpright(img image.Image, orientation int) image.Image {
switch orientation {
case UprightMirrored:
img = imaging.FlipH(img)
return imaging.FlipH(img)
case UpsideDown:
img = imaging.Rotate180(img)
return imaging.Rotate180(img)
case UpsideDownMirrored:
img = imaging.FlipV(img)
return imaging.FlipV(img)
case RotatedCWMirrored:
img = imaging.Transpose(img)
return imaging.Transpose(img)
case RotatedCCW:
img = imaging.Rotate270(img)
return imaging.Rotate270(img)
case RotatedCCWMirrored:
img = imaging.Transverse(img)
return imaging.Transverse(img)
case RotatedCW:
img = imaging.Rotate90(img)
return imaging.Rotate90(img)
default:
return img
}
return &img, width, height
}
func getImageOrientation(imageData []byte) (int, error) {
if exifData, err := exif.Decode(bytes.NewReader(imageData)); err != nil {
func getImageOrientation(input io.Reader) (int, error) {
if exifData, err := exif.Decode(input); err != nil {
return Upright, err
} else {
if tag, err := exifData.Get("Orientation"); err != nil {
......
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment