Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

enhancement: use goenning/imagic (#747)

Guilherme Oenning23a289197853
diff --git a/Gopkg.lock b/Gopkg.lock
index 8d19dcaf0..66c05160b 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -60,6 +60,14 @@
revision = "0bd5694c78c9c3d9a3cd06a706a8f3c59296a9ac"
version = "v1.5.0"
+[[projects]]
+ digest = "1:c6991fa57e45dbd4a062d408e34c601f1804d474e4eeb0f297e6841b21fc004c"
+ name = "github.com/goenning/imagic"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "b509a5b14a964a79ab463f21019f457cad2ab710"
+ version = "v0.0.1"
+
[[projects]]
branch = "master"
digest = "1:c7073f7f18a2be8b8a31e8e23fe16c2141c3cbd0170c3eacea8f167438f3b655"
@@ -308,7 +316,7 @@
"github.com/aws/aws-sdk-go/aws/session",
"github.com/aws/aws-sdk-go/service/s3",
"github.com/dgrijalva/jwt-go",
- "github.com/disintegration/imaging",
+ "github.com/goenning/imagic",
"github.com/goenning/letteravatar",
"github.com/goenning/vat",
"github.com/gosimple/slug",
@@ -321,7 +329,6 @@
"github.com/stripe/stripe-go/client",
"golang.org/x/crypto/acme",
"golang.org/x/crypto/acme/autocert",
- "golang.org/x/image/draw",
"golang.org/x/oauth2",
"golang.org/x/oauth2/facebook",
"golang.org/x/oauth2/github",
diff --git a/Gopkg.toml b/Gopkg.toml
index 9d69d2915..daf6949e0 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -54,8 +54,8 @@ ignored = ["github.com/magefile/mage/mg","github.com/magefile/mage/sh"]
name = "github.com/stripe/stripe-go"
[[constraint]]
- version = "v1.5.0"
- name = "github.com/disintegration/imaging"
+ version = "v0.0.1"
+ name = "github.com/goenning/imagic"
[[constraint]]
branch = "master"
diff --git a/app/handlers/images.go b/app/handlers/images.go
index 44aac879f..3737779b6 100644
--- a/app/handlers/images.go
+++ b/app/handlers/images.go
@@ -12,9 +12,9 @@ import (
"github.com/getfider/fider/app/pkg/crypto"
"github.com/getfider/fider/app/pkg/env"
- "github.com/getfider/fider/app/pkg/img"
"github.com/getfider/fider/app/pkg/log"
"github.com/getfider/fider/app/pkg/web"
+ "github.com/goenning/imagic"
"github.com/goenning/letteravatar"
)
@@ -136,17 +136,17 @@ func Favicon() web.HandlerFunc {
size = between(size, 50, 200)
- opts := []img.ImageOperation{}
+ opts := []imagic.ImageOperation{}
if size > 0 {
- opts = append(opts, img.Padding(size*10/100))
- opts = append(opts, img.Resize(size))
+ opts = append(opts, imagic.Padding(size*10/100))
+ opts = append(opts, imagic.Resize(size))
}
if c.QueryParam("bg") != "" {
- opts = append(opts, img.ChangeBackground(color.White))
+ opts = append(opts, imagic.ChangeBackground(color.White))
}
- bytes, err = img.Apply(bytes, opts...)
+ bytes, err = imagic.Apply(bytes, opts...)
if err != nil {
return c.Failure(err)
}
@@ -174,7 +174,7 @@ func ViewUploadedImage() web.HandlerFunc {
bytes := logo.Object
if size > 0 {
- bytes, err = img.Apply(bytes, img.Resize(size))
+ bytes, err = imagic.Apply(bytes, imagic.Resize(size))
if err != nil {
return c.Failure(err)
}
diff --git a/app/pkg/img/img_test.go b/app/pkg/img/img_test.go
deleted file mode 100644
index e7df9b830..000000000
--- a/app/pkg/img/img_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package img_test
-
-import (
- "image/color"
- "io/ioutil"
- "os"
- "testing"
-
- . "github.com/getfider/fider/app/pkg/assert"
- "github.com/getfider/fider/app/pkg/env"
- "github.com/getfider/fider/app/pkg/img"
-)
-
-var parseTestCases = []struct {
- fileName string
- width int
- height int
- supported bool
-}{
- {"/app/pkg/img/testdata/logo1.png", 300, 300, true},
- {"/app/pkg/img/testdata/logo2.jpg", 2624, 2184, true},
- {"/app/pkg/img/testdata/logo3.gif", 1165, 822, true},
- {"/app/pkg/img/testdata/logo4.png", 150, 150, true},
- {"/app/pkg/img/testdata/logo5.png", 200, 200, true},
- {"/app/pkg/img/testdata/logo6.jpg", 400, 400, true},
- {"/app/pkg/img/testdata/logo7.gif", 400, 400, true},
- {"/app/pkg/img/testdata/favicon.ico", 0, 0, false},
-}
-
-func TestImageParse(t *testing.T) {
- RegisterT(t)
-
- for _, testCase := range parseTestCases {
- bytes, err := ioutil.ReadFile(env.Path(testCase.fileName))
- Expect(err).IsNil()
-
- file, err := img.Parse(bytes)
- if testCase.supported {
- Expect(err).IsNil()
- Expect(file.Width).Equals(testCase.width)
- Expect(file.Height).Equals(testCase.height)
- Expect(file.Size).Equals(len(bytes))
- } else {
- Expect(err).Equals(img.ErrNotSupported)
- Expect(file).IsNil()
- }
- }
-}
-
-var resizeTestCases = []struct {
- fileName string
- resizedFileName string
- size int
- padding int
- skipCI bool
-}{
- {"/app/pkg/img/testdata/logo1.png", "/app/pkg/img/testdata/logo1-200x200.png", 200, 0, false},
- {"/app/pkg/img/testdata/logo2.jpg", "/app/pkg/img/testdata/logo2-200w.jpg", 200, 0, true},
- {"/app/pkg/img/testdata/logo2.jpg", "/app/pkg/img/testdata/logo2-200w-pad20.jpg", 200, 20, true},
- {"/app/pkg/img/testdata/logo3.gif", "/app/pkg/img/testdata/logo3-200w.gif", 200, 0, true},
- {"/app/pkg/img/testdata/logo4.png", "/app/pkg/img/testdata/logo4-100x100.png", 100, 0, false},
- {"/app/pkg/img/testdata/logo5.png", "/app/pkg/img/testdata/logo5-200x200.png", 200, 0, false},
- {"/app/pkg/img/testdata/logo6.jpg", "/app/pkg/img/testdata/logo6-200x200.jpg", 200, 0, false},
- {"/app/pkg/img/testdata/logo7.gif", "/app/pkg/img/testdata/logo7-200x200.gif", 200, 0, false},
- {"/app/pkg/img/testdata/logo7.gif", "/app/pkg/img/testdata/logo7-1000-1000.gif", 1000, 0, false},
- {"/app/pkg/img/testdata/logo8.png", "/app/pkg/img/testdata/logo8-200h.gif", 200, 0, false},
-}
-
-func TestImageResize(t *testing.T) {
- RegisterT(t)
-
- for _, testCase := range resizeTestCases {
- // we don't run it on CI because it's way too slow, we need to investigate why
- if testCase.skipCI && os.Getenv("CI") == "true" {
- continue
- }
-
- bytes, err := ioutil.ReadFile(env.Path(testCase.fileName))
- Expect(err).IsNil()
-
- resized, err := img.Apply(
- bytes,
- img.Resize(testCase.size),
- img.Padding(testCase.padding),
- )
- Expect(err).IsNil()
-
- expected, err := ioutil.ReadFile(env.Path(testCase.resizedFileName))
- Expect(err).IsNil()
-
- Expect(resized).Equals(expected)
- }
-}
-
-var bgColorTestCases = []struct {
- fileName string
- whiteColorFileName string
- bgColor color.Color
-}{
- {"/app/pkg/img/testdata/logo1.png", "/app/pkg/img/testdata/logo1-white.png", color.White},
- {"/app/pkg/img/testdata/logo1.png", "/app/pkg/img/testdata/logo1-black.png", color.Black},
-}
-
-func TestImageChangeBackground(t *testing.T) {
- RegisterT(t)
-
- for _, testCase := range bgColorTestCases {
- bytes, err := ioutil.ReadFile(env.Path(testCase.fileName))
- Expect(err).IsNil()
-
- withColor, err := img.Apply(bytes, img.ChangeBackground(testCase.bgColor))
- Expect(err).IsNil()
-
- expected, err := ioutil.ReadFile(env.Path(testCase.whiteColorFileName))
- Expect(err).IsNil()
-
- Expect(withColor).Equals(expected)
- }
-}
diff --git a/app/pkg/img/testdata/logo1-200x200.png b/app/pkg/img/testdata/logo1-200x200.png
deleted file mode 100755
index 92f361640..000000000
Binary files a/app/pkg/img/testdata/logo1-200x200.png and /dev/null differ
diff --git a/app/pkg/img/testdata/logo1-black.png b/app/pkg/img/testdata/logo1-black.png
deleted file mode 100755
index 3d8eaf8a1..000000000
Binary files a/app/pkg/img/testdata/logo1-black.png and /dev/null differ
diff --git a/app/pkg/img/testdata/logo1-white.png b/app/pkg/img/testdata/logo1-white.png
deleted file mode 100755
index 41b97a530..000000000
Binary files a/app/pkg/img/testdata/logo1-white.png and /dev/null differ
diff --git a/app/pkg/img/testdata/logo2-200w-pad20.jpg b/app/pkg/img/testdata/logo2-200w-pad20.jpg
deleted file mode 100755
index bb2fb057b..000000000
Binary files a/app/pkg/img/testdata/logo2-200w-pad20.jpg and /dev/null differ
diff --git a/app/pkg/img/testdata/logo2-200w.jpg b/app/pkg/img/testdata/logo2-200w.jpg
deleted file mode 100755
index c21c208d6..000000000
Binary files a/app/pkg/img/testdata/logo2-200w.jpg and /dev/null differ
diff --git a/app/pkg/img/testdata/logo4-100x100.png b/app/pkg/img/testdata/logo4-100x100.png
deleted file mode 100755
index 00855d298..000000000
Binary files a/app/pkg/img/testdata/logo4-100x100.png and /dev/null differ
diff --git a/app/pkg/img/testdata/logo5-200x200.png b/app/pkg/img/testdata/logo5-200x200.png
deleted file mode 100755
index e48d06c3b..000000000
Binary files a/app/pkg/img/testdata/logo5-200x200.png and /dev/null differ
diff --git a/app/pkg/img/testdata/logo6-200x200.jpg b/app/pkg/img/testdata/logo6-200x200.jpg
deleted file mode 100755
index ce2ebe113..000000000
Binary files a/app/pkg/img/testdata/logo6-200x200.jpg and /dev/null differ
diff --git a/app/pkg/img/testdata/logo6.jpg b/app/pkg/img/testdata/logo6.jpg
deleted file mode 100644
index 293035ea4..000000000
Binary files a/app/pkg/img/testdata/logo6.jpg and /dev/null differ
diff --git a/app/pkg/img/testdata/logo7-1000-1000.gif b/app/pkg/img/testdata/logo7-1000-1000.gif
deleted file mode 100755
index 00202032f..000000000
Binary files a/app/pkg/img/testdata/logo7-1000-1000.gif and /dev/null differ
diff --git a/app/pkg/img/testdata/logo7-200x200.gif b/app/pkg/img/testdata/logo7-200x200.gif
deleted file mode 100755
index 6997d307c..000000000
Binary files a/app/pkg/img/testdata/logo7-200x200.gif and /dev/null differ
diff --git a/app/pkg/img/testdata/logo7.gif b/app/pkg/img/testdata/logo7.gif
deleted file mode 100644
index 3cd870fb3..000000000
Binary files a/app/pkg/img/testdata/logo7.gif and /dev/null differ
diff --git a/app/pkg/img/testdata/logo8-200h.gif b/app/pkg/img/testdata/logo8-200h.gif
deleted file mode 100755
index aabc78c2b..000000000
Binary files a/app/pkg/img/testdata/logo8-200h.gif and /dev/null differ
diff --git a/app/pkg/img/testdata/logo8.png b/app/pkg/img/testdata/logo8.png
deleted file mode 100644
index 2797d1c4d..000000000
Binary files a/app/pkg/img/testdata/logo8.png and /dev/null differ
diff --git a/app/pkg/validate/upload.go b/app/pkg/validate/upload.go
index 35af3a2ea..2ecf9bf9e 100644
--- a/app/pkg/validate/upload.go
+++ b/app/pkg/validate/upload.go
@@ -4,7 +4,7 @@ import (
"fmt"
"github.com/getfider/fider/app/models"
- "github.com/getfider/fider/app/pkg/img"
+ "github.com/goenning/imagic"
)
// MaxDimensionSize is the max width/height of an image. If image is bigger than this, it'll be resized.
@@ -81,9 +81,9 @@ func ImageUpload(upload *models.ImageUpload, opts ImageUploadOpts) ([]string, er
}
if upload != nil && upload.Upload != nil && len(upload.Upload.Content) > 0 {
- logo, err := img.Parse(upload.Upload.Content)
+ logo, err := imagic.Parse(upload.Upload.Content)
if err != nil {
- if err == img.ErrNotSupported {
+ if err == imagic.ErrNotSupported {
messages = append(messages, "This file format not supported.")
} else {
return nil, err
@@ -103,7 +103,7 @@ func ImageUpload(upload *models.ImageUpload, opts ImageUploadOpts) ([]string, er
}
if logo.Height > MaxDimensionSize && logo.Width > MaxDimensionSize {
- newImageBytes, err := img.Apply(upload.Upload.Content, img.Resize(MaxDimensionSize))
+ newImageBytes, err := imagic.Apply(upload.Upload.Content, imagic.Resize(MaxDimensionSize))
if err != nil {
return nil, err
}
diff --git a/app/pkg/validate/upload_test.go b/app/pkg/validate/upload_test.go
index 5e43ae1b4..33765bcd0 100644
--- a/app/pkg/validate/upload_test.go
+++ b/app/pkg/validate/upload_test.go
@@ -17,13 +17,13 @@ func TestValidateImageUpload(t *testing.T) {
fileName string
count int
}{
- {"/app/pkg/img/testdata/logo1.png", 0},
- {"/app/pkg/img/testdata/logo2.jpg", 2},
- {"/app/pkg/img/testdata/logo3.gif", 1},
- {"/app/pkg/img/testdata/logo4.png", 1},
- {"/app/pkg/img/testdata/logo5.png", 0},
+ {"/app/pkg/web/testdata/logo1.png", 0},
+ {"/app/pkg/web/testdata/logo2.jpg", 2},
+ {"/app/pkg/web/testdata/logo3.gif", 1},
+ {"/app/pkg/web/testdata/logo4.png", 1},
+ {"/app/pkg/web/testdata/logo5.png", 0},
{"/README.md", 1},
- {"/app/pkg/img/testdata/favicon.ico", 1},
+ {"/app/pkg/web/testdata/favicon.ico", 1},
}
for _, testCase := range testCases {
@@ -48,7 +48,7 @@ func TestValidateImageUpload(t *testing.T) {
func TestValidateImageUpload_ExactRatio(t *testing.T) {
RegisterT(t)
- img, _ := ioutil.ReadFile(env.Path("/app/pkg/img/testdata/logo3-200w.gif"))
+ img, _ := ioutil.ReadFile(env.Path("/app/pkg/web/testdata/logo3-200w.gif"))
opts := validate.ImageUploadOpts{
IsRequired: false,
MaxKilobytes: 200,
@@ -125,7 +125,7 @@ func TestValidateImageUpload_Required(t *testing.T) {
func TestValidateMultiImageUpload(t *testing.T) {
RegisterT(t)
- img, _ := ioutil.ReadFile(env.Path("/app/pkg/img/testdata/logo3-200w.gif"))
+ img, _ := ioutil.ReadFile(env.Path("/app/pkg/web/testdata/logo3-200w.gif"))
uploads := []*models.ImageUpload{
&models.ImageUpload{
@@ -156,7 +156,7 @@ func TestValidateMultiImageUpload(t *testing.T) {
func TestValidateMultiImageUpload_Existing(t *testing.T) {
RegisterT(t)
- img, _ := ioutil.ReadFile(env.Path("/app/pkg/img/testdata/logo3-200w.gif"))
+ img, _ := ioutil.ReadFile(env.Path("/app/pkg/web/testdata/logo3-200w.gif"))
uploads := []*models.ImageUpload{
&models.ImageUpload{
diff --git a/app/pkg/img/testdata/favicon.ico b/app/pkg/web/testdata/favicon.ico
similarity index 100%
rename from app/pkg/img/testdata/favicon.ico
rename to app/pkg/web/testdata/favicon.ico
diff --git a/app/pkg/img/testdata/logo1.png b/app/pkg/web/testdata/logo1.png
similarity index 100%
rename from app/pkg/img/testdata/logo1.png
rename to app/pkg/web/testdata/logo1.png
diff --git a/app/pkg/img/testdata/logo2.jpg b/app/pkg/web/testdata/logo2.jpg
similarity index 100%
rename from app/pkg/img/testdata/logo2.jpg
rename to app/pkg/web/testdata/logo2.jpg
diff --git a/app/pkg/img/testdata/logo3-200w.gif b/app/pkg/web/testdata/logo3-200w.gif
similarity index 100%
rename from app/pkg/img/testdata/logo3-200w.gif
rename to app/pkg/web/testdata/logo3-200w.gif
diff --git a/app/pkg/img/testdata/logo3.gif b/app/pkg/web/testdata/logo3.gif
similarity index 100%
rename from app/pkg/img/testdata/logo3.gif
rename to app/pkg/web/testdata/logo3.gif
diff --git a/app/pkg/img/testdata/logo4.png b/app/pkg/web/testdata/logo4.png
similarity index 100%
rename from app/pkg/img/testdata/logo4.png
rename to app/pkg/web/testdata/logo4.png
diff --git a/app/pkg/img/testdata/logo5.png b/app/pkg/web/testdata/logo5.png
similarity index 100%
rename from app/pkg/img/testdata/logo5.png
rename to app/pkg/web/testdata/logo5.png
diff --git a/app/pkg/web/util/webutil_test.go b/app/pkg/web/util/webutil_test.go
index 81f748f73..c410ba7e7 100644
--- a/app/pkg/web/util/webutil_test.go
+++ b/app/pkg/web/util/webutil_test.go
@@ -53,7 +53,7 @@ func TestGetOAuthBaseURL_WithPort(t *testing.T) {
func TestProcessImageUpload(t *testing.T) {
RegisterT(t)
- img, _ := ioutil.ReadFile(env.Path("/app/pkg/img/testdata/logo3-200w.gif"))
+ img, _ := ioutil.ReadFile(env.Path("/app/pkg/web/testdata/logo3-200w.gif"))
services := &app.Services{
Blobs: di.NewBlobStorage(nil),
}
@@ -80,7 +80,7 @@ func TestProcessImageUpload(t *testing.T) {
func TestMultiProcessImageUpload(t *testing.T) {
RegisterT(t)
- img, _ := ioutil.ReadFile(env.Path("/app/pkg/img/testdata/logo3-200w.gif"))
+ img, _ := ioutil.ReadFile(env.Path("/app/pkg/web/testdata/logo3-200w.gif"))
services := &app.Services{
Blobs: di.NewBlobStorage(nil),
}
diff --git a/vendor/github.com/goenning/imagic/LICENSE b/vendor/github.com/goenning/imagic/LICENSE
new file mode 100644
index 000000000..b09711e93
--- /dev/null
+++ b/vendor/github.com/goenning/imagic/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Guilherme Oenning
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/vendor/github.com/goenning/imagic/README.md b/vendor/github.com/goenning/imagic/README.md
new file mode 100644
index 000000000..5d5af5df1
--- /dev/null
+++ b/vendor/github.com/goenning/imagic/README.md
@@ -0,0 +1,3 @@
+# imagic
+
+A small wrapper around github.com/disintegration/imaging to provide a simpler API for resizing, adding padding and change background color.
\ No newline at end of file
diff --git a/vendor/github.com/goenning/imagic/go.mod b/vendor/github.com/goenning/imagic/go.mod
new file mode 100644
index 000000000..8627f625f
--- /dev/null
+++ b/vendor/github.com/goenning/imagic/go.mod
@@ -0,0 +1,9 @@
+module github.com/goenning/imagic
+
+go 1.12
+
+require (
+ github.com/disintegration/imaging v1.6.0
+ github.com/stretchr/testify v1.3.0
+ golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f
+)
diff --git a/vendor/github.com/goenning/imagic/go.sum b/vendor/github.com/goenning/imagic/go.sum
new file mode 100644
index 000000000..70d942fa4
--- /dev/null
+++ b/vendor/github.com/goenning/imagic/go.sum
@@ -0,0 +1,13 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
+github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f h1:FO4MZ3N56GnxbqxGKqh+YTzUWQ2sDwtFQEZgLOxh9Jc=
+golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/app/pkg/img/img.go b/vendor/github.com/goenning/imagic/imagic.go
similarity index 88%
rename from app/pkg/img/img.go
rename to vendor/github.com/goenning/imagic/imagic.go
index 3695f65c2..61f1685f9 100644
--- a/app/pkg/img/img.go
+++ b/vendor/github.com/goenning/imagic/imagic.go
@@ -1,30 +1,28 @@
-package img
+package imagic
import (
"bytes"
+ "errors"
"image"
"image/color"
"image/png"
- stdError "errors"
-
"github.com/disintegration/imaging"
- "github.com/getfider/fider/app/pkg/errors"
"golang.org/x/image/draw"
)
//ErrNotSupported returned by Parse when given file is not in a supported format
-var ErrNotSupported = stdError.New("File not supported")
+var ErrNotSupported = errors.New("File not supported")
-//File is an image supported by Fider
+//File contains metadata of a given image
type File struct {
Width int
Height int
Size int
}
-//Parse returns the a img.File if it's supported by fider
+//Parse returns the a File if it's in supported format
func Parse(file []byte) (*File, error) {
reader := bytes.NewReader(file)
@@ -105,7 +103,7 @@ func Apply(input []byte, operations ...ImageOperation) ([]byte, error) {
func decode(file []byte) (image.Image, string, error) {
src, format, err := image.Decode(bytes.NewReader(file))
if err != nil {
- return nil, "", errors.Wrap(err, "failed to decode image")
+ return nil, "", err
}
return src, format, err
}
@@ -120,7 +118,7 @@ func encode(img image.Image, format string) ([]byte, error) {
imaging.JPEGQuality(95),
)
if err != nil {
- return nil, errors.Wrap(err, "failed to encode image to '%s'", format)
+ return nil, err
}
return writer.Bytes(), nil
}