resources/images: Fix WebP useSharpYuv being ignored

Closes #14449

diff --git a/resources/images/codec.go b/resources/images/codec.go
index fd5f22433ab9061c320d6e03fe4ff14449129aac..16840ac341ea90986400bd3c929d22412bba4596 100644 (file)
--- a/resources/images/codec.go
+++ b/resources/images/codec.go
@@ -125,11 +125,16 @@ func (d *Codec) EncodeTo(conf ImageConfig, w io.Writer, img image.Image) error {
        case BMP:
                return bmp.Encode(w, img)
        case WEBP:
+               // Convert bool to int because the C code reads it as a number.
+               useSharpYuvInt := 0
+               if conf.UseSharpYuv {
+                       useSharpYuvInt = 1
+               }
                opts := map[string]any{
                        "compression": conf.Compression,
                        "quality":     conf.Quality,
                        "hint":        conf.Hint,
-                       "useSharpYuv": conf.UseSharpYuv,
+                       "useSharpYuv": useSharpYuvInt,
                        "method":      conf.Method,
                }
                return d.webp.Encode(w, img, opts)

diff --git a/resources/images/testdata/images_golden/losslessvsquality/resize-300x300-webp-lossy.webp b/resources/images/testdata/images_golden/losslessvsquality/resize-300x300-webp-lossy.webp
index 2e648b7be876bce8c9eb99cc9f5b779afc061390..d577d5b80d8f6e99900c6ad9a80f6c0b8cf77022 100644 (file)
Binary files a/resources/images/testdata/images_golden/losslessvsquality/resize-300x300-webp-lossy.webp and b/resources/images/testdata/images_golden/losslessvsquality/resize-300x300-webp-lossy.webp 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
index 2973b2e2d83084e63126097d670d5429021b0143..4d1521060767a0b52b8d7d314f88649966423a5e 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/crop-300x300-smart-ff9999.webp 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.webp b/resources/images/testdata/images_golden/process/webp/crop-300x300-smart.webp
index 0627f350de70dbbf7a926da6a61470e85cecd5c6..ccf44bc4445981bf27b149a227620450455ee7f8 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/crop-300x300-smart.webp and b/resources/images/testdata/images_golden/process/webp/crop-300x300-smart.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/crop-300x300.webp b/resources/images/testdata/images_golden/process/webp/crop-300x300.webp
index 5904509dfdde09618dc7651b6bfe2074a3eaa3de..077130c613d6c24c758f2abb9216824f57e43af4 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/crop-300x300.webp and b/resources/images/testdata/images_golden/process/webp/crop-300x300.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/crop-500x200-smart-webp.webp b/resources/images/testdata/images_golden/process/webp/crop-500x200-smart-webp.webp
index b608683ad8391052445e5514e54d68121a725879..d4d1eed742b9bbc7a89a897000829adf1a0c091c 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/crop-500x200-smart-webp.webp and b/resources/images/testdata/images_golden/process/webp/crop-500x200-smart-webp.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/fit-300x400-webp.webp b/resources/images/testdata/images_golden/process/webp/fit-300x400-webp.webp
index e99f5805e62b4981cb6493047c023df1f9318ca7..52ec5ff7a7a5edcfc205a17adabc9b7d052b0cfa 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/fit-300x400-webp.webp and b/resources/images/testdata/images_golden/process/webp/fit-300x400-webp.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/fit-400x500-webp.webp b/resources/images/testdata/images_golden/process/webp/fit-400x500-webp.webp
index 84de4c5dca4d5714b711f863146a8bdf697f7a2d..ade72b13235643c793ff4d7df6e9e4b4eb9387ea 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/fit-400x500-webp.webp and b/resources/images/testdata/images_golden/process/webp/fit-400x500-webp.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-drawing.webp b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-drawing.webp
index 4a94f72148b68b649fe777bfbdac8779f2f3e16f..8a0d20580658f16b9b9cdca13f81e8f19663110f 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-drawing.webp and b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-drawing.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-icon.webp b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-icon.webp
index cd13d1db4cdde637d9bb14539fdaad46ca9dec1f..38c8ef6d934611091ba317e066e116b5c041c72c 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-icon.webp and b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-icon.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q1.webp b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q1.webp
index 2d1b9f86a2ce9607b301355d59449046f9085321..26d64c4c8e2bfd095477442803b085b2f90d4856 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q1.webp and b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q1.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q100.webp b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q100.webp
index cc4a5c2fe1397bbae99be832d1f7133c415b66b5..763ea0705628216dca2277c70674c4bd4bda01a0 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q100.webp and b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q100.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q33.webp b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q33.webp
index 55180b0746581e9a46c3435818aebf8a097bc128..1d397b652e977341d249c2938daf67a8a7e3da85 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q33.webp and b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q33.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q50-drawing.webp b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q50-drawing.webp
index 1a8e1cf3b32aa0a7acc664fd6eb30ae462acd2f8..1c1611b89088b57ace9746d293739401467623b1 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q50-drawing.webp and b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q50-drawing.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q75.webp b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q75.webp
index 3d81589c2366ad81793bb1af69c58f8c1ee8c201..29e2524cebd0cc95045449f16cfc0252da5c7d5a 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q75.webp and b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp-q75.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp.webp b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp.webp
index bfc2050d452623543f324e601d61726f8828e8a1..f524e2c194f04d63440b8dbebb44b5cbdc9ac6da 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/resize-300x300-webp.webp and b/resources/images/testdata/images_golden/process/webp/resize-300x300-webp.webp differ

diff --git a/resources/images/testdata/images_golden/process/webp/resize-400x.webp b/resources/images/testdata/images_golden/process/webp/resize-400x.webp
index 1b5136b235a4a158c318786dd8e44288fe4a567d..e6beb43324ff7d61ede611bb91789a6e91b75241 100644 (file)
Binary files a/resources/images/testdata/images_golden/process/webp/resize-400x.webp and b/resources/images/testdata/images_golden/process/webp/resize-400x.webp differ

diff --git a/resources/images/testdata/images_golden/webp/animation/anim_hu_edc2f24aaad2cee6.webp b/resources/images/testdata/images_golden/webp/animation/anim_hu_edc2f24aaad2cee6.webp
index 10ce746feb1644cdebb6bf1fa0f29d5deb5219dc..c1be9e82441180ef426d5286f94fb68e5519b678 100644 (file)
Binary files a/resources/images/testdata/images_golden/webp/animation/anim_hu_edc2f24aaad2cee6.webp and b/resources/images/testdata/images_golden/webp/animation/anim_hu_edc2f24aaad2cee6.webp differ

diff --git a/resources/images/testdata/images_golden/webp/animation/giphy_hu_bb052284cc220165.webp b/resources/images/testdata/images_golden/webp/animation/giphy_hu_bb052284cc220165.webp
index cc11d24e52c66615f74cc5f0a67724bda437451b..62c7cef863401dd7203cb8b0e515ae82af63c1c9 100644 (file)
Binary files a/resources/images/testdata/images_golden/webp/animation/giphy_hu_bb052284cc220165.webp and b/resources/images/testdata/images_golden/webp/animation/giphy_hu_bb052284cc220165.webp differ