From 19badf636955b21ada3474a8fc8bf392fa340717 Mon Sep 17 00:00:00 2001 From: C85297 <95289555+C85297@users.noreply.github.com> Date: Thu, 5 Feb 2026 16:01:13 +0000 Subject: [PATCH] Fix contain image parameters --- src/core/operations/ContainImage.mjs | 7 +++---- tests/browser/02_ops.js | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/operations/ContainImage.mjs b/src/core/operations/ContainImage.mjs index e59ecd11..37ac1e18 100644 --- a/src/core/operations/ContainImage.mjs +++ b/src/core/operations/ContainImage.mjs @@ -119,20 +119,19 @@ class ContainImage extends Operation { if (isWorkerEnvironment()) self.sendStatusMessage("Containing image..."); image.contain({ - width, - height, + w: width, + h: height, align: alignMap[hAlign] | alignMap[vAlign], mode: resizeMap[alg], }); if (opaqueBg) { const newImage = await Jimp.read(width, height, 0x000000ff); - newImage.blit({ + image = newImage.blit({ image, x: 0, y: 0, }); - image = newImage; } let imageBuffer; diff --git a/tests/browser/02_ops.js b/tests/browser/02_ops.js index e3be0c03..c340fca4 100644 --- a/tests/browser/02_ops.js +++ b/tests/browser/02_ops.js @@ -65,6 +65,7 @@ module.exports = { testOp(browser, ["From Hex", "Blur Image", "SHA2"], Images.PNG_HEX, "24f2e89f3e00cc35f551bbc48ea82e76474946ce0282183494d1ca3d3b0012c27b6102c4368ae056dc7fecb6df7886d86ff3d29b7e5965493f30c371eee9a24e"); testOp(browser, ["From Hex", "Blur Image", "SHA2"], Images.PNG_HEX, "2c49d89fc10c94352c9a19f82de353c37928831d6f976a6b36eb918825a0ba027980801838228a4a0da63f1886e4fa59b6666f992ad2d2b7d4622253dc034052", [[], [5, "Gaussian"], []]); testOp(browser, ["From Hex", "Sharpen Image", "SHA2"], Images.PNG_HEX, "acc7027642c2eeb67d7356a80ed8a1bdce9adabf656ea1294e47723f506626a7aa41f1660fa844a1e1e83b17180017ab0d5bccd7f6a341692832020dc887eaa5"); + testOp(browser, ["From Hex", "Contain Image", "SHA2"], Images.PNG_HEX, "cb871ad0722d487d56a2b18247b1aa30ecc244eb717e08e23a55cae78759553312dc1717196d7cb9daa04743e57c56fc3901ba92be5a68fb03c377f718e8efe7"); testOpHtml(browser, "Bombe", "XTSYN WAEUG EZALY NRQIM AMLZX MFUOD AWXLY LZCUZ QOQBQ JLCPK NDDRW F", "table tr:last-child td:first-child", "ECG", ["3-rotor", "LEYJVCNIXWPBQMDRTAKZGFUHOS", "BDFHJLCPRTXVZNYEIWGAKMUSQO