Mirror/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2024-11-02 22:21:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve printing text to improve output quality.

Browse Source 
Now resizes the text instead of the image
This commit is contained in:
j433866 2019-06-20 12:58:02 +01:00
parent 99bef09e0e
commit 0bcf57e89c
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/core/operations/AddTextToImage.mjs
View File

@ -23,7 +23,7 @@ class AddTextToImage extends Operation {
this.name = "Add Text To Image"; this.name = "Add Text To Image";
this.module = "Image"; this.module = "Image";
this.description = "Adds text onto an image.<br><br>Text can be horizontally or vertically aligned, or the position can be manually specified.<br>Variants of the Roboto font face are available in any size or colour.<br><br>Note: This may cause a degradation in image quality, especially when using font sizes larger than 72."; this.description = "Adds text onto an image.<br><br>Text can be horizontally or vertically aligned, or the position can be manually specified.<br>Variants of the Roboto font face are available in any size or colour.";
this.infoURL = ""; this.infoURL = "";
this.inputType = "ArrayBuffer"; this.inputType = "ArrayBuffer";
this.outputType = "ArrayBuffer"; this.outputType = "ArrayBuffer";
@ -152,14 +152,12 @@ class AddTextToImage extends Operation {
// Make Webpack load the png font images // Make Webpack load the png font images
const fontImages = [ await Promise.all([
import(/* webpackMode: "eager" */ "../../web/static/fonts/bmfonts/Roboto72White.png"), import(/* webpackMode: "eager" */ "../../web/static/fonts/bmfonts/Roboto72White.png"),
import(/* webpackMode: "eager" */ "../../web/static/fonts/bmfonts/RobotoSlab72White.png"), import(/* webpackMode: "eager" */ "../../web/static/fonts/bmfonts/RobotoSlab72White.png"),
import(/* webpackMode: "eager" */ "../../web/static/fonts/bmfonts/RobotoMono72White.png"), import(/* webpackMode: "eager" */ "../../web/static/fonts/bmfonts/RobotoMono72White.png"),
import(/* webpackMode: "eager" */ "../../web/static/fonts/bmfonts/RobotoBlack72White.png") import(/* webpackMode: "eager" */ "../../web/static/fonts/bmfonts/RobotoBlack72White.png")
]; ]);
await Promise.all(fontImages);
const font = fontsMap[fontFace]; const font = fontsMap[fontFace];
@ -190,14 +188,18 @@ class AddTextToImage extends Operation {
} }
}); });
// Scale the image to a factor of 72, so we can print the text at any size // Create a temporary image to hold the rendered text
const scaleFactor = 72 / size; const textImage = new jimp(jimp.measureText(jimpFont, text), jimp.measureTextHeight(jimpFont, text));
if (size !== 72) { textImage.print(jimpFont, 0, 0, text);
// Scale the rendered text image to the correct size
const scaleFactor = size / 72;
if (size !== 1) {
// Use bicubic for decreasing size // Use bicubic for decreasing size
if (size > 72) { if (size > 1) {
image.scale(scaleFactor, jimp.RESIZE_BICUBIC); textImage.scale(scaleFactor, jimp.RESIZE_BICUBIC);
} else { } else {
image.scale(scaleFactor, jimp.RESIZE_BILINEAR); textImage.scale(scaleFactor, jimp.RESIZE_BILINEAR);
} }
} }
@ -207,14 +209,11 @@ class AddTextToImage extends Operation {
xPos = 0; xPos = 0;
break; break;
case "Center": case "Center":
xPos = (image.getWidth() / 2) - (jimp.measureText(jimpFont, text) / 2); xPos = (image.getWidth() / 2) - (textImage.getWidth() / 2);
break; break;
case "Right": case "Right":
xPos = image.getWidth() - jimp.measureText(jimpFont, text); xPos = image.getWidth() - textImage.getWidth();
break; break;
default:
// Adjust x position for the scaled image
xPos = xPos * scaleFactor;
} }
switch (vAlign) { switch (vAlign) {
@ -222,25 +221,15 @@ class AddTextToImage extends Operation {
yPos = 0; yPos = 0;
break; break;
case "Middle": case "Middle":
yPos = (image.getHeight() / 2) - (jimp.measureTextHeight(jimpFont, text) / 2); yPos = (image.getHeight() / 2) - (textImage.getHeight() / 2);
break; break;
case "Bottom": case "Bottom":
yPos = image.getHeight() - jimp.measureTextHeight(jimpFont, text); yPos = image.getHeight() - textImage.getHeight();
break; break;
default:
// Adjust y position for the scaled image
yPos = yPos * scaleFactor;
} }
image.print(jimpFont, xPos, yPos, text); // Blit the rendered text image onto the original source image
image.blit(textImage, xPos, yPos);
if (size !== 72) {
if (size > 72) {
image.scale(1 / scaleFactor, jimp.RESIZE_BILINEAR);
} else {
image.scale(1 / scaleFactor, jimp.RESIZE_BICUBIC);
}
}
let imageBuffer; let imageBuffer;
if (image.getMIME() === "image/gif") { if (image.getMIME() === "image/gif") {