diff --git a/server/api/utilities.go b/server/api/utilities.go index 733299ae8..b86e68c63 100644 --- a/server/api/utilities.go +++ b/server/api/utilities.go @@ -12,6 +12,7 @@ import ( "image" "image/jpeg" + "github.com/disintegration/imageorient" "github.com/muesli/smartcrop" "github.com/muesli/smartcrop/nfnt" @@ -26,7 +27,7 @@ type ResizedImage struct { } func resizeLoadedMedia(ctx context.Context, lm *repositories.LoadedMedia, newWidth, newHeight uint) (resized *ResizedImage, err error) { - original, _, err := image.Decode(lm.Reader) + original, _, err := imageorient.Decode(lm.Reader) if err != nil { return nil, err } diff --git a/server/go.mod b/server/go.mod index 33dd2fb6b..245ed0d5b 100644 --- a/server/go.mod +++ b/server/go.mod @@ -26,6 +26,8 @@ require ( github.com/dgrijalva/jwt-go v0.0.0-20170201225849-2268707a8f08 github.com/dimfeld/httppath v0.0.0-20170720192232-ee938bf73598 github.com/dimfeld/httptreemux v5.0.1+incompatible + github.com/disintegration/gift v1.2.1 // indirect + github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec github.com/dropbox/godropbox v0.0.0-20190501155911-5749d3b71cbe // indirect github.com/fieldkit/app-protocol v0.0.0-20200515173549-e0925480073d github.com/fieldkit/data-protocol v0.0.0-20200825203301-d452c6499956 diff --git a/server/go.sum b/server/go.sum index 18c621101..5e6063bdb 100644 --- a/server/go.sum +++ b/server/go.sum @@ -117,6 +117,12 @@ github.com/dimfeld/httptreemux v5.0.1+incompatible h1:Qj3gVcDNoOthBAqftuD596rm4w github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0= github.com/dimfeld/httptreemux/v5 v5.0.2 h1:q+c+zKVpQocXT2OGa7dsXCX9wdeDq2TO5INqqDfKRLE= github.com/dimfeld/httptreemux/v5 v5.0.2/go.mod h1:QeEylH57C0v3VO0tkKraVz9oD3Uu93CKPnTLbsidvSw= +github.com/disintegration/gift v1.1.2 h1:9ZyHJr+kPamiH10FX3Pynt1AxFUob812bU9Wt4GMzhs= +github.com/disintegration/gift v1.1.2/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI= +github.com/disintegration/gift v1.2.1 h1:Y005a1X4Z7Uc+0gLpSAsKhWi4qLtsdEcMIbbdvdZ6pc= +github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI= +github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec h1:YrB6aVr9touOt75I9O1SiancmR2GMg45U9UYf0gtgWg= +github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec/go.mod h1:K0KBFIr1gWu/C1Gp10nFAcAE4hsB7JxE6OgLijrJ8Sk= github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20200213202729-31a86c4ab209/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=