Fix alpha/fuzzy border issue with new webp decoder for images with with transparent...

Fixes #14339

diff --git a/internal/warpc/webp.go b/internal/warpc/webp.go
index ea83409227911020236cbb1dc4227e3a665132ea..bc5d9973af42aa4dd69ceb291df5b9791c8e4587 100644 (file)
--- a/internal/warpc/webp.go
+++ b/internal/warpc/webp.go
@@ -142,7 +142,7 @@ func (d *WebpCodec) Decode(r io.Reader) (image.Image, error) {
                frames := make([]image.Image, len(destination.Bytes())/frameSize)
                for i := 0; i < len(frames); i++ {
                        frameBytes := destination.Bytes()[i*frameSize : (i+1)*frameSize]
-                       frameImg := &image.RGBA{
+                       frameImg := &image.NRGBA{
                                Pix:    frameBytes,
                                Stride: stride,
                                Rect:   image.Rect(0, 0, w, h),
@@ -153,7 +153,7 @@ func (d *WebpCodec) Decode(r io.Reader) (image.Image, error) {
                return img, nil
        }
 
-       img := &image.RGBA{
+       img := &image.NRGBA{
                Pix:    destination.Bytes(),
                Stride: stride,
                Rect:   image.Rect(0, 0, w, h),

diff --git a/resources/images/images_golden_integration_test.go b/resources/images/images_golden_integration_test.go
index a3976d56762be107fbfbd6fdc27168d1f2bfa8a4..6b6b41e41944dfa1f98a729ef8af510658343ca6 100644 (file)
--- a/resources/images/images_golden_integration_test.go
+++ b/resources/images/images_golden_integration_test.go
@@ -372,7 +372,7 @@ sourcefilename: ../testdata/giphy.gif
 sourcefilename: ../testdata/sunset.jpg
 -- layouts/home.html --
 Home.
-{{ $fuzzyCircle := resources.Get "fuzzycircle.png" }}
+{{ $fuzzyCircle := resources.Get "fuzzycircle.webp" }}
 {{ $highContrast := resources.Get "highcontrast.webp" }}
 {{ $sunset := resources.Get "sunset.jpg" }}
 {{ $sunsetGrayscale := $sunset.Filter (images.Grayscale) }}

diff --git a/resources/images/testdata/images_golden/process/webp/crop-300x300-smart-ff9999.png b/resources/images/testdata/images_golden/process/webp/crop-300x300-smart-ff9999.png
deleted file mode 100644 (file)
index 32c1121..0000000
Binary files a/resources/images/testdata/images_golden/process/webp/crop-300x300-smart-ff9999.png and /dev/null differ

diff --git a/resources/images/testdata/images_golden/process/webp/crop-300x300-smart-ff9999.webp b/resources/images/testdata/images_golden/process/webp/crop-300x300-smart-ff9999.webp
new file mode 100644 (file)
index 0000000..2973b2e
Binary files /dev/null and b/resources/images/testdata/images_golden/process/webp/crop-300x300-smart-ff9999.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/crop-300x300-smart.png b/resources/images/testdata/images_golden/process/webp/crop-300x300-smart.png
deleted file mode 100644 (file)
index 95497d8..0000000
Binary files a/resources/images/testdata/images_golden/process/webp/crop-300x300-smart.png and /dev/null differ

diff --git a/resources/images/testdata/images_golden/process/webp/crop-300x300-smart.webp b/resources/images/testdata/images_golden/process/webp/crop-300x300-smart.webp
new file mode 100644 (file)
index 0000000..0627f35
Binary files /dev/null and b/resources/images/testdata/images_golden/process/webp/crop-300x300-smart.webp differ