From 1ae78235da52c984705c99a53ae0f2bdc90f6214 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 26 Aug 2023 14:49:13 -0600
Subject: [PATCH] Don't even reference image/jpeg
---
jpeg2/jpeg_picker.go | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/jpeg2/jpeg_picker.go b/jpeg2/jpeg_picker.go
index b53e5728..ee49e7bb 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() {
--
GitLab