diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-08-10 15:54:15 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-08-10 15:54:15 +0200 |
| commit | 9a9702c9641e1488e69f07e1cb6b1af31410a3dc (patch) | |
| tree | de6f8612b8ff1573f9a1c80ac21d90371e2cc166 /internal/media/image.go | |
| parent | [chore] bump exif-terminator to 0.4.0 (#747) (diff) | |
| download | gotosocial-9a9702c9641e1488e69f07e1cb6b1af31410a3dc.tar.xz | |
[bugfix] Check orientation when reading width/height of images (#749)
Diffstat (limited to 'internal/media/image.go')
| -rw-r--r-- | internal/media/image.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/internal/media/image.go b/internal/media/image.go index 9dd699dc6..e1fc5c331 100644 --- a/internal/media/image.go +++ b/internal/media/image.go @@ -72,9 +72,12 @@ func decodeImage(r io.Reader, contentType string) (*imageMeta, error) { switch contentType { case mimeImageJpeg: - i, err = jpeg.Decode(r) + i, err = imaging.Decode(r, imaging.AutoOrientation(true)) case mimeImagePng: - i, err = StrippedPngDecode(r) + strippedPngReader := io.Reader(&PNGAncillaryChunkStripper{ + Reader: r, + }) + i, err = imaging.Decode(strippedPngReader, imaging.AutoOrientation(true)) default: err = fmt.Errorf("content type %s not recognised", contentType) } |