diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-11-30 10:50:28 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-11-30 10:50:28 +0100 |
| commit | 0108463e7b179af1c796042dd10f4fe1020b9075 (patch) | |
| tree | e18fb53a8950153be0a17060329b70ef5d222be8 /internal/media | |
| parent | [performance/postgres] Rename constraints, remove duplicate indexes (#2392) (diff) | |
| download | gotosocial-0108463e7b179af1c796042dd10f4fe1020b9075.tar.xz | |
[bugfix] Update exif-terminator (fix png issue) (#2391)
* [bugfix] Update exif-terminator (fix png issue)
* bump exif terminator
* fix tests
Diffstat (limited to 'internal/media')
| -rw-r--r-- | internal/media/manager.go | 3 | ||||
| -rw-r--r-- | internal/media/manager_test.go | 2 | ||||
| -rw-r--r-- | internal/media/processingmedia.go | 2 | ||||
| -rw-r--r-- | internal/media/test/test-png-alphachannel-processed.png | bin | 18904 -> 18904 bytes |
4 files changed, 3 insertions, 4 deletions
diff --git a/internal/media/manager.go b/internal/media/manager.go index dfae37d80..5f496a71d 100644 --- a/internal/media/manager.go +++ b/internal/media/manager.go @@ -53,8 +53,7 @@ type Manager struct { // NewManager returns a media manager with given state. func NewManager(state *state.State) *Manager { - m := &Manager{state: state} - return m + return &Manager{state: state} } // PreProcessMedia begins the process of decoding diff --git a/internal/media/manager_test.go b/internal/media/manager_test.go index 4a3d3c886..f90c182fe 100644 --- a/internal/media/manager_test.go +++ b/internal/media/manager_test.go @@ -404,7 +404,7 @@ func (suite *ManagerTestSuite) TestSimpleJpegProcessPartial() { // Since we're cutting off the byte stream // halfway through, we should get an error here. - suite.EqualError(err, "finish: error decoding image: unexpected EOF") + suite.EqualError(err, "store: error writing media to storage: scan-data is unbounded; EOI not encountered before EOF") suite.NotNil(attachment) // make sure it's got the stuff set on it that we expect diff --git a/internal/media/processingmedia.go b/internal/media/processingmedia.go index 3627d8cd3..74745305c 100644 --- a/internal/media/processingmedia.go +++ b/internal/media/processingmedia.go @@ -29,7 +29,7 @@ import ( "codeberg.org/gruf/go-runners" "github.com/disintegration/imaging" "github.com/h2non/filetype" - terminator "github.com/superseriousbusiness/exif-terminator" + "github.com/superseriousbusiness/exif-terminator" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/log" diff --git a/internal/media/test/test-png-alphachannel-processed.png b/internal/media/test/test-png-alphachannel-processed.png Binary files differindex d3b67e66d..9d05d45ef 100644 --- a/internal/media/test/test-png-alphachannel-processed.png +++ b/internal/media/test/test-png-alphachannel-processed.png |
