From 3c8aeb445a9db53de05c167ba4ce25ba9e3156aa Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Thu, 25 Aug 2022 12:58:44 +0200 Subject: [PATCH] Remove the `CanvasGraphics.getCanvasPosition` method This old method, which is only used with the `imageLayer` functionality, is essentially just a re-implementation of the existing `Util.applyTransform` method. --- src/display/canvas.js | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/display/canvas.js b/src/display/canvas.js index 53faae50b..eebfdbcc4 100644 --- a/src/display/canvas.js +++ b/src/display/canvas.js @@ -3067,11 +3067,14 @@ class CanvasGraphics { ); if (this.imageLayer) { - const position = this.getCanvasPosition(0, -height); + const [left, top] = Util.applyTransform( + [0, -height], + getCurrentTransform(this.ctx) + ); this.imageLayer.appendImage({ imgData, - left: position[0], - top: position[1], + left, + top, width: rWidth, height: rHeight, }); @@ -3109,11 +3112,14 @@ class CanvasGraphics { 1 ); if (this.imageLayer) { - const position = this.getCanvasPosition(entry.x, entry.y); + const [left, top] = Util.applyTransform( + [entry.x, entry.y], + getCurrentTransform(this.ctx) + ); this.imageLayer.appendImage({ imgData, - left: position[0], - top: position[1], + left, + top, width: w, height: h, }); @@ -3309,14 +3315,6 @@ class CanvasGraphics { } } - getCanvasPosition(x, y) { - const transform = getCurrentTransform(this.ctx); - return [ - transform[0] * x + transform[2] * y + transform[4], - transform[1] * x + transform[3] * y + transform[5], - ]; - } - isContentVisible() { for (let i = this.markedContentStack.length - 1; i >= 0; i--) { if (!this.markedContentStack[i].visible) {