diff --git a/jpeg2/jpeg_picker.go b/jpeg2/jpeg_picker.go index b53e5728911193a99513c257f5b7ffa50f8aab1e..ee49e7bb07291e29b8d974abac67a2bed70daca3 100644 --- a/jpeg2/jpeg_picker.go +++ b/jpeg2/jpeg_picker.go @@ -2,35 +2,17 @@ package jpeg2 import ( "image" - gojpeg "image/jpeg" "io" - "github.com/turt2live/matrix-media-repo/util/readers" libjpeg "github.com/viam-labs/go-libjpeg/jpeg" ) func Decode(r io.Reader) (image.Image, error) { - br := readers.NewBufferReadsReader(r) - c, err := libjpeg.Decode(r, &libjpeg.DecoderOptions{}) - if err != nil { - r = br.GetRewoundReader() - return gojpeg.Decode(r) - } else { - br.Discard() - } - return c, nil + return libjpeg.Decode(r, &libjpeg.DecoderOptions{}) } func DecodeConfig(r io.Reader) (image.Config, error) { - br := readers.NewBufferReadsReader(r) - c, err := libjpeg.DecodeConfig(r) - if err != nil { - r = br.GetRewoundReader() - return gojpeg.DecodeConfig(r) - } else { - br.Discard() - } - return c, nil + return libjpeg.DecodeConfig(r) } func init() {