Skip to content

Only compile Type3 glyphs when Path2D is supported #15306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timvandermeij merged 1 commit into from
Aug 13, 2022
+13 −41
Merged

Only compile Type3 glyphs when Path2D is supported #15306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 13 additions & 41 deletions src/display/canvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,14 @@ const EXECUTION_TIME = 15; // ms
// Defines the number of steps before checking the execution time.
const EXECUTION_STEPS = 10;

const COMPILE_TYPE3_GLYPHS = true;
const MAX_SIZE_TO_COMPILE = 1000;
// To disable Type3 compilation, set the value to `-1`.
const MAX_SIZE_TO_COMPILE =
typeof PDFJSDev !== "undefined" &&
PDFJSDev.test("GENERIC") &&
isNodeJS &&
typeof Path2D === "undefined"
? -1
: 1000;

const FULL_CHUNK_HEIGHT = 16;

Expand Down Expand Up @@ -294,11 +300,7 @@ function drawImageAtIntegerCoords(

function compileType3Glyph(imgData) {
const { width, height } = imgData;
if (
!COMPILE_TYPE3_GLYPHS ||
width > MAX_SIZE_TO_COMPILE ||
height > MAX_SIZE_TO_COMPILE
) {
if (width > MAX_SIZE_TO_COMPILE || height > MAX_SIZE_TO_COMPILE) {
return null;
}

Expand Down Expand Up @@ -404,12 +406,7 @@ function compileType3Glyph(imgData) {

// building outlines
const steps = new Int32Array([0, width1, -1, 0, -width1, 0, 0, 0, 1]);
let path, outlines, coords;
if (!isNodeJS) {
path = new Path2D();
} else {
outlines = [];
}
const path = new Path2D();

for (i = 0; count && i <= height; i++) {
let p = i * width1;
Expand All @@ -420,12 +417,7 @@ function compileType3Glyph(imgData) {
if (p === end) {
continue;
}

if (path) {
path.moveTo(p % width1, i);
} else {
coords = [p % width1, i];
}
path.moveTo(p % width1, i);

const p0 = p;
let type = points[p];
Expand All @@ -448,21 +440,12 @@ function compileType3Glyph(imgData) {
// set new type for "future hit"
points[p] &= (type >> 2) | (type << 2);
}

if (path) {
path.lineTo(p % width1, (p / width1) | 0);
} else {
coords.push(p % width1, (p / width1) | 0);
}
path.lineTo(p % width1, (p / width1) | 0);

if (!points[p]) {
--count;
}
} while (p0 !== p);

if (!path) {
outlines.push(coords);
}
--i;
}

Expand All @@ -475,18 +458,7 @@ function compileType3Glyph(imgData) {
// the path shall be painted in [0..1]x[0..1] space
c.scale(1 / width, -1 / height);
c.translate(0, -height);
if (path) {
c.fill(path);
} else {
c.beginPath();
for (const o of outlines) {
c.moveTo(o[0], o[1]);
for (let l = 2, ll = o.length; l < ll; l += 2) {
c.lineTo(o[l], o[l + 1]);
}
}
c.fill();
}
c.fill(path);
c.beginPath();
c.restore();
};
Expand Down