Print Perf Enhancement (#616)

* faster lint * easier to understand * add deps * lint * crop no longer needed
jimp-dev · Sep 17, 2018 · 558e4fe · 558e4fe
1 parent 8d6ecf8
commit 558e4fe
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json
@@ -24,11 +24,12 @@
     "load-bmfont": "^1.4.0"
   },
   "peerDependencies": {
-    "@jimp/custom": ">=0.3.5"
+    "@jimp/custom": ">=0.3.5",
+    "@jimp/plugin-blit": ">=0.3.5"
   },
   "devDependencies": {
     "@jimp/custom": "^0.5.0",
-    "@jimp/plugin-crop": "^0.5.0",
+    "@jimp/plugin-blit": "^0.5.0",
     "@jimp/test-utils": "^0.5.0"
   },
   "publishConfig": {

diff --git a/packages/plugin-print/src/index.js b/packages/plugin-print/src/index.js
@@ -17,16 +17,17 @@ function xOffsetBasedOnAlignment(constants, font, line, maxWidth, alignment) {
 
 function drawCharacter(image, font, x, y, char) {
   if (char.width > 0 && char.height > 0) {
-    let imageChar = char.image;
-
-    if (!imageChar) {
-      imageChar = font.pages[char.page]
-        .cloneQuiet()
-        .crop(char.x, char.y, char.width, char.height);
-      char.image = imageChar;
-    }
-
-    return image.composite(imageChar, x + char.xoffset, y + char.yoffset);
+    const characterPage = font.pages[char.page];
+
+    image.blit(
+      characterPage,
+      x + char.xoffset,
+      y + char.yoffset,
+      char.x,
+      char.y,
+      char.width,
+      char.height
+    );
   }
 
   return image;
@@ -49,9 +50,10 @@ function printText(font, x, y, text, defaultCharWidth) {
 
     drawCharacter(this, font, x, y, fontChar || {});
 
-    x +=
-      (fontKerning && fontKerning[text[i + 1]] ? fontKerning[text[i + 1]] : 0) +
-      (fontChar.xadvance || defaultCharWidth);
+    const kerning =
+      fontKerning && fontKerning[text[i + 1]] ? fontKerning[text[i + 1]] : 0;
+
+    x += kerning + (fontChar.xadvance || defaultCharWidth);
   }
 }
 
@@ -290,18 +292,18 @@ export default () => ({
 
       lines.forEach(line => {
         const lineString = line.join(' ');
+        const alignmentWidth = xOffsetBasedOnAlignment(
+          this.constructor,
+          font,
+          lineString,
+          maxWidth,
+          alignmentX
+        );
 
         printText.call(
           this,
           font,
-          x +
-            xOffsetBasedOnAlignment(
-              this.constructor,
-              font,
-              lineString,
-              maxWidth,
-              alignmentX
-            ),
+          x + alignmentWidth,
           y,
           lineString,
           defaultCharWidth

diff --git a/packages/plugin-print/test/images/SANS_16_BLACK-positioned.png b/packages/plugin-print/test/images/SANS_16_BLACK-positioned.png
diff --git a/packages/plugin-print/test/images/print-number.png b/packages/plugin-print/test/images/print-number.png
diff --git a/packages/plugin-print/test/images/unknown-char-test.png b/packages/plugin-print/test/images/unknown-char-test.png
diff --git a/packages/plugin-print/test/print.test.js b/packages/plugin-print/test/print.test.js
@@ -2,11 +2,11 @@
 
 import { Jimp, getTestDir, hasOwnProp } from '@jimp/test-utils';
 import configure from '@jimp/custom';
-import crop from '@jimp/plugin-crop';
+import blit from '@jimp/plugin-blit';
 
 import print from '../src';
 
-const jimp = configure({ plugins: [print, crop] }, Jimp);
+const jimp = configure({ plugins: [print, blit] }, Jimp);
 
 async function createTextImage(
   width,
@@ -110,6 +110,7 @@ describe('Write text over image', function() {
     );
     const textImage = await createTextImage(320, 240, Jimp.FONT_SANS_16_BLACK, {
       text: 'This is only a test.',
+
       maxWidth: 100
     });
 
@@ -122,6 +123,7 @@ describe('Write text over image', function() {
     );
     const textImage = await createTextImage(320, 240, Jimp.FONT_SANS_16_BLACK, {
       text: { text: 'This is only a test.' },
+
       maxWidth: 100
     });