qreator 9.3.0 → 9.4.0

package/lib/browser/matrix.d.ts

@@ -7,3 +7,4 @@ export declare const fillReserved: (matrix: Matrix, ec_level: EcLevel, mask: num
 export declare const fillData: (matrix: Matrix, data: Data, mask: number) => void;
 export declare function calculatePenalty(matrix: Matrix): number;
 export declare function getMatrix(data: Data): number[][];
+export declare function clearMatrixCenter(matrix: Matrix, widthPct: number, heightPct: number): Matrix;

package/lib/browser/pdf.umd.js

@@ -26095,6 +26095,21 @@
         fillReserved(matrix, data.ec_level, bestMask);
         return matrix.map((row) => row.map((cell) => cell & 1));
     }
+    function clearMatrixCenter(matrix, widthPct, heightPct) {
+        matrix = matrix.map((x) => x.slice());
+        const mW = matrix.length;
+        const cW = Math.ceil(((mW * widthPct) / 100 + (mW % 2)) / 2) * 2 - (mW % 2);
+        const mH = matrix[0]?.length ?? 0;
+        const cH = Math.ceil(((mH * heightPct) / 100 + (mH % 2)) / 2) * 2 - (mH % 2);
+        const clearStartX = Math.round((mW - cW) / 2);
+        const clearStartY = Math.round((mH - cH) / 2);
+        for (let x = clearStartX; x < clearStartX + cW; x += 1) {
+            for (let y = clearStartY; y < clearStartY + cH; y += 1) {
+                matrix[x][y] = 0;
+            }
+        }
+        return matrix;
+    }
 
     const EC_LEVELS = ["L", "M", "Q", "H"];
     function getTemplate(message, ec_level) {
@@ -26705,7 +26720,7 @@
                     rectangle.push(`M ${leftX} ${topY + borderRadius}`);
                     rectangle.push(`L ${leftX} ${bottomY - borderRadius}`);
                     if (borderRadius > 0) {
-                        rectangle.push(`A ${borderRadius} ${borderRadius} 0 0 0 ${leftX + borderRadius} ${bottomY} `);
+                        rectangle.push(`A ${borderRadius} ${borderRadius} 0 0 0 ${leftX + borderRadius} ${bottomY}`);
                     }
                     rectangle.push(`L ${rightX - borderRadius} ${bottomY}`);
                     if (borderRadius > 0) {
@@ -26750,7 +26765,10 @@
     const textDec = new TextDecoder();
     async function getPDF(text, inOptions) {
         const options = getOptions(inOptions);
-        const matrix = QR(text, options.ec_level, options.parse_url);
+        let matrix = QR(text, options.ec_level, options.parse_url);
+        if (options.logo && options.logoWidth && options.logoHeight) {
+            matrix = clearMatrixCenter(matrix, options.logoWidth, options.logoHeight);
+        }
         return PDF({ matrix, ...options });
     }
     function colorToRGB(color) {
@@ -26758,29 +26776,27 @@
             const [red, green, blue] = colorString.get.rgb(color);
             return [red / 255, green / 255, blue / 255];
         }
-        return [
-            ((color >>> 24) % 256) / 255,
-            ((color >>> 16) % 256) / 255,
-            ((color >>> 8) % 256) / 255,
-        ];
+        return [((color >>> 24) % 256) / 255, ((color >>> 16) % 256) / 255, ((color >>> 8) % 256) / 255];
     }
     function getOpacity(color) {
         if (typeof color === "string") {
             return colorString.get.rgb(color)[3];
         }
-        return ((color % 256) / 255);
+        return (color % 256) / 255;
     }
     async function PDF({ matrix, margin, logo, logoWidth, logoHeight, color, bgColor, borderRadius, }) {
         const size = 9;
+        const marginPx = margin * size;
+        const matrixSizePx = matrix.length * size;
+        const imageSizePx = matrixSizePx + 2 * marginPx;
         const document = await PDFDocument.create();
-        const pageSize = (matrix.length + 2 * margin) * size;
-        const page = document.addPage([pageSize, pageSize]);
+        const page = document.addPage([imageSizePx, imageSizePx]);
         page.drawSquare({
-            size: pageSize,
+            size: imageSizePx,
             color: rgb(...colorToRGB(bgColor)),
         });
         page.moveTo(0, page.getHeight());
-        const path = getSVGPath(matrix, size, margin * size, borderRadius);
+        const path = getSVGPath(matrix, size, marginPx, borderRadius);
         page.drawSvgPath(path, {
             color: rgb(...colorToRGB(color)),
             opacity: getOpacity(color),
@@ -26796,12 +26812,13 @@
             else {
                 logoData = await document.embedJpg(logo);
             }
+            const logoWidthPx = (logoWidth / 100) * matrixSizePx;
+            const logoHeightPx = (logoHeight / 100) * matrixSizePx;
             page.drawImage(logoData, {
-                x: page.getWidth() / 2 - (logoWidth / 100) * (page.getWidth() / 2),
-                y: page.getHeight() / 2 -
-                    (logoHeight / 100) * (page.getWidth() / 2),
-                width: (logoWidth / 100) * page.getWidth(),
-                height: (logoHeight / 100) * page.getHeight(),
+                x: (imageSizePx - logoWidthPx) / 2,
+                y: (imageSizePx - logoHeightPx) / 2,
+                width: logoWidthPx,
+                height: logoHeightPx,
             });
         }
         return document.save();