From be05851bf17d24fa2ae229bc8d6d54fd786bed85 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jul 2020 20:32:40 -0600
Subject: [PATCH] Use golang's built-in webp support instead of a 3rd party
---
controllers/thumbnail_controller/thumbnail_resource_handler.go | 2 +-
go.mod | 1 -
go.sum | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/controllers/thumbnail_controller/thumbnail_resource_handler.go b/controllers/thumbnail_controller/thumbnail_resource_handler.go
index f7819123..d4da0f70 100644
--- a/controllers/thumbnail_controller/thumbnail_resource_handler.go
+++ b/controllers/thumbnail_controller/thumbnail_resource_handler.go
@@ -16,7 +16,6 @@ import (
"strconv"
"sync"
- "github.com/chai2010/webp"
"github.com/disintegration/imaging"
"github.com/kettek/apng"
"github.com/prometheus/client_golang/prometheus"
@@ -32,6 +31,7 @@ import (
"github.com/turt2live/matrix-media-repo/util/cleanup"
"github.com/turt2live/matrix-media-repo/util/resource_handler"
"github.com/turt2live/matrix-media-repo/util/util_exif"
+ "golang.org/x/image/webp"
)
type thumbnailResourceHandler struct {
diff --git a/go.mod b/go.mod
index 8c4ddf00..30246d0e 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,6 @@ require (
github.com/bep/debounce v1.2.0
github.com/buckket/go-blurhash v1.0.3
github.com/cenk/backoff v2.2.1+incompatible // indirect
- github.com/chai2010/webp v1.1.0
github.com/cupcake/sigil v0.0.0-20131127230922-6bf9722f2ae8
github.com/didip/tollbooth v4.0.2+incompatible
github.com/disintegration/imaging v1.6.2
diff --git a/go.sum b/go.sum
index 330d93e6..eface946 100644
--- a/go.sum
+++ b/go.sum
@@ -71,8 +71,6 @@ github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chai2010/webp v1.1.0 h1:4Ei0/BRroMF9FaXDG2e4OxwFcuW2vcXd+A6tyqTJUQQ=
-github.com/chai2010/webp v1.1.0/go.mod h1:LP12PG5IFmLGHUU26tBiCBKnghxx3toZFwDjOYvd3Ow=
github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
--
GitLab