mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-25 09:38:06 +02:00
Fixes lint warning W004 in src/core
This commit is contained in:
Tim van der Meij
parent
7a2cb7cddd
commit
df91acf239
14 changed files with 593 additions and 516 deletions
|
|
@ -33,22 +33,23 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
var offset = (getUshort(data, start + 2) === 1 ?
|
||||
getLong(data, start + 8) : getLong(data, start + 16));
|
||||
var format = getUshort(data, start + offset);
|
||||
var length, ranges, p, i;
|
||||
if (format === 4) {
|
||||
var length = getUshort(data, start + offset + 2);
|
||||
length = getUshort(data, start + offset + 2);
|
||||
var segCount = getUshort(data, start + offset + 6) >> 1;
|
||||
var p = start + offset + 14;
|
||||
var ranges = [];
|
||||
for (var i = 0; i < segCount; i++, p += 2) {
|
||||
p = start + offset + 14;
|
||||
ranges = [];
|
||||
for (i = 0; i < segCount; i++, p += 2) {
|
||||
ranges[i] = {end: getUshort(data, p)};
|
||||
}
|
||||
p += 2;
|
||||
for (var i = 0; i < segCount; i++, p += 2) {
|
||||
for (i = 0; i < segCount; i++, p += 2) {
|
||||
ranges[i].start = getUshort(data, p);
|
||||
}
|
||||
for (var i = 0; i < segCount; i++, p += 2) {
|
||||
for (i = 0; i < segCount; i++, p += 2) {
|
||||
ranges[i].idDelta = getUshort(data, p);
|
||||
}
|
||||
for (var i = 0; i < segCount; i++, p += 2) {
|
||||
for (i = 0; i < segCount; i++, p += 2) {
|
||||
var idOffset = getUshort(data, p);
|
||||
if (idOffset === 0) {
|
||||
continue;
|
||||
|
|
@ -61,11 +62,11 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
}
|
||||
return ranges;
|
||||
} else if (format === 12) {
|
||||
var length = getLong(data, start + offset + 4);
|
||||
length = getLong(data, start + offset + 4);
|
||||
var groups = getLong(data, start + offset + 12);
|
||||
var p = start + offset + 16;
|
||||
var ranges = [];
|
||||
for (var i = 0; i < groups; i++) {
|
||||
p = start + offset + 16;
|
||||
ranges = [];
|
||||
for (i = 0; i < groups; i++) {
|
||||
ranges.push({
|
||||
start: getLong(data, p),
|
||||
end: getLong(data, p + 4),
|
||||
|
|
@ -151,12 +152,13 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
var yMin = ((code[i + 4] << 24) | (code[i + 5] << 16)) >> 16;
|
||||
var xMax = ((code[i + 6] << 24) | (code[i + 7] << 16)) >> 16;
|
||||
var yMax = ((code[i + 8] << 24) | (code[i + 9] << 16)) >> 16;
|
||||
var flags;
|
||||
var x = 0, y = 0;
|
||||
i += 10;
|
||||
if (numberOfContours < 0) {
|
||||
// composite glyph
|
||||
var x = 0, y = 0;
|
||||
do {
|
||||
var flags = (code[i] << 8) | code[i + 1];
|
||||
flags = (code[i] << 8) | code[i + 1];
|
||||
var glyphIndex = (code[i + 2] << 8) | code[i + 3];
|
||||
i += 4;
|
||||
var arg1, arg2;
|
||||
|
|
@ -201,7 +203,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
} else {
|
||||
// simple glyph
|
||||
var endPtsOfContours = [];
|
||||
for (var j = 0; j < numberOfContours; j++) {
|
||||
var j, jj;
|
||||
for (j = 0; j < numberOfContours; j++) {
|
||||
endPtsOfContours.push((code[i] << 8) | code[i + 1]);
|
||||
i += 2;
|
||||
}
|
||||
|
|
@ -210,7 +213,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
var numberOfPoints = endPtsOfContours[endPtsOfContours.length - 1] + 1;
|
||||
var points = [];
|
||||
while (points.length < numberOfPoints) {
|
||||
var flags = code[i++], repeat = 1;
|
||||
flags = code[i++];
|
||||
var repeat = 1;
|
||||
if ((flags & 0x08)) {
|
||||
repeat += code[i++];
|
||||
}
|
||||
|
|
@ -218,8 +222,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
points.push({flags: flags});
|
||||
}
|
||||
}
|
||||
var x = 0, y = 0;
|
||||
for (var j = 0; j < numberOfPoints; j++) {
|
||||
for (j = 0; j < numberOfPoints; j++) {
|
||||
switch (points[j].flags & 0x12) {
|
||||
case 0x00:
|
||||
x += ((code[i] << 24) | (code[i + 1] << 16)) >> 16;
|
||||
|
|
@ -234,7 +237,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
}
|
||||
points[j].x = x;
|
||||
}
|
||||
for (var j = 0; j < numberOfPoints; j++) {
|
||||
for (j = 0; j < numberOfPoints; j++) {
|
||||
switch (points[j].flags & 0x24) {
|
||||
case 0x00:
|
||||
y += ((code[i] << 24) | (code[i + 1] << 16)) >> 16;
|
||||
|
|
@ -251,7 +254,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
}
|
||||
|
||||
var startPoint = 0;
|
||||
for (var i = 0; i < numberOfContours; i++) {
|
||||
for (i = 0; i < numberOfContours; i++) {
|
||||
var endPoint = endPtsOfContours[i];
|
||||
// contours might have implicit points, which is located in the middle
|
||||
// between two neighboring off-curve points
|
||||
|
|
@ -272,7 +275,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
contour.push(p);
|
||||
}
|
||||
moveTo(contour[0].x, contour[0].y);
|
||||
for (var j = 1, jj = contour.length; j < jj; j++) {
|
||||
for (j = 1, jj = contour.length; j < jj; j++) {
|
||||
if ((contour[j].flags & 1)) {
|
||||
lineTo(contour[j].x, contour[j].y);
|
||||
} else if ((contour[j + 1].flags & 1)){
|
||||
|
|
@ -311,6 +314,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
while (i < code.length) {
|
||||
var stackClean = false;
|
||||
var v = code[i++];
|
||||
var xa, xb, ya, yb, y1, y2, y3, n, subrCode;
|
||||
switch (v) {
|
||||
case 1: // hstem
|
||||
stems += stack.length >> 1;
|
||||
|
|
@ -356,15 +360,15 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
break;
|
||||
case 8: // rrcurveto
|
||||
while (stack.length > 0) {
|
||||
var xa = x + stack.shift(), ya = y + stack.shift();
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x + stack.shift(); ya = y + stack.shift();
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb + stack.shift(); y = yb + stack.shift();
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
}
|
||||
break;
|
||||
case 10: // callsubr
|
||||
var n = stack.pop() + font.subrsBias;
|
||||
var subrCode = font.subrs[n];
|
||||
n = stack.pop() + font.subrsBias;
|
||||
subrCode = font.subrs[n];
|
||||
if (subrCode) {
|
||||
parse(subrCode);
|
||||
}
|
||||
|
|
@ -375,44 +379,44 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
v = code[i++];
|
||||
switch (v) {
|
||||
case 34: // flex
|
||||
var xa = x + stack.shift();
|
||||
var xb = xa + stack.shift(), y1 = y + stack.shift();
|
||||
xa = x + stack.shift();
|
||||
xb = xa + stack.shift(); y1 = y + stack.shift();
|
||||
x = xb + stack.shift();
|
||||
bezierCurveTo(xa, y, xb, y1, x, y1);
|
||||
var xa = x + stack.shift();
|
||||
var xb = xa + stack.shift();
|
||||
xa = x + stack.shift();
|
||||
xb = xa + stack.shift();
|
||||
x = xb + stack.shift();
|
||||
bezierCurveTo(xa, y1, xb, y, x, y);
|
||||
break;
|
||||
case 35: // flex
|
||||
var xa = x + stack.shift(), ya = y + stack.shift();
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x + stack.shift(); ya = y + stack.shift();
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb + stack.shift(); y = yb + stack.shift();
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
var xa = x + stack.shift(), ya = y + stack.shift();
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x + stack.shift(); ya = y + stack.shift();
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb + stack.shift(); y = yb + stack.shift();
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
stack.pop(); // fd
|
||||
break;
|
||||
case 36: // hflex1
|
||||
var xa = x + stack.shift(), y1 = y + stack.shift();
|
||||
var xb = xa + stack.shift(), y2 = y1 + stack.shift();
|
||||
xa = x + stack.shift(); y1 = y + stack.shift();
|
||||
xb = xa + stack.shift(); y2 = y1 + stack.shift();
|
||||
x = xb + stack.shift();
|
||||
bezierCurveTo(xa, y1, xb, y2, x, y2);
|
||||
var xa = x + stack.shift();
|
||||
var xb = xa + stack.shift(), y3 = y2 + stack.shift();
|
||||
xa = x + stack.shift();
|
||||
xb = xa + stack.shift(); y3 = y2 + stack.shift();
|
||||
x = xb + stack.shift();
|
||||
bezierCurveTo(xa, y2, xb, y3, x, y);
|
||||
break;
|
||||
case 37: // flex1
|
||||
var x0 = x, y0 = y;
|
||||
var xa = x + stack.shift(), ya = y + stack.shift();
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x + stack.shift(); ya = y + stack.shift();
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb + stack.shift(); y = yb + stack.shift();
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
var xa = x + stack.shift(), ya = y + stack.shift();
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x + stack.shift(); ya = y + stack.shift();
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb; y = yb;
|
||||
if (Math.abs(x - x0) > Math.abs(y - y0)) {
|
||||
x += stack.shift();
|
||||
|
|
@ -474,8 +478,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
break;
|
||||
case 24: // rcurveline
|
||||
while (stack.length > 2) {
|
||||
var xa = x + stack.shift(), ya = y + stack.shift();
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x + stack.shift(); ya = y + stack.shift();
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb + stack.shift(); y = yb + stack.shift();
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
}
|
||||
|
|
@ -489,8 +493,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
y += stack.shift();
|
||||
lineTo(x, y);
|
||||
}
|
||||
var xa = x + stack.shift(), ya = y + stack.shift();
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x + stack.shift(); ya = y + stack.shift();
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb + stack.shift(); y = yb + stack.shift();
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
break;
|
||||
|
|
@ -499,8 +503,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
x += stack.shift();
|
||||
}
|
||||
while (stack.length > 0) {
|
||||
var xa = x, ya = y + stack.shift();
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x; ya = y + stack.shift();
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb; y = yb + stack.shift();
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
}
|
||||
|
|
@ -510,8 +514,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
y += stack.shift();
|
||||
}
|
||||
while (stack.length > 0) {
|
||||
var xa = x + stack.shift(), ya = y;
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x + stack.shift(); ya = y;
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb + stack.shift(); y = yb;
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
}
|
||||
|
|
@ -521,16 +525,16 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
i += 2;
|
||||
break;
|
||||
case 29: // callgsubr
|
||||
var n = stack.pop() + font.gsubrsBias;
|
||||
var subrCode = font.gsubrs[n];
|
||||
n = stack.pop() + font.gsubrsBias;
|
||||
subrCode = font.gsubrs[n];
|
||||
if (subrCode) {
|
||||
parse(subrCode);
|
||||
}
|
||||
break;
|
||||
case 30: // vhcurveto
|
||||
while (stack.length > 0) {
|
||||
var xa = x, ya = y + stack.shift();
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x; ya = y + stack.shift();
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb + stack.shift();
|
||||
y = yb + (stack.length === 1 ? stack.shift() : 0);
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
|
|
@ -538,8 +542,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
break;
|
||||
}
|
||||
|
||||
var xa = x + stack.shift(), ya = y;
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x + stack.shift(); ya = y;
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
y = yb + stack.shift();
|
||||
x = xb + (stack.length === 1 ? stack.shift() : 0);
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
|
|
@ -547,8 +551,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
break;
|
||||
case 31: // hvcurveto
|
||||
while (stack.length > 0) {
|
||||
var xa = x + stack.shift(), ya = y;
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x + stack.shift(); ya = y;
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
y = yb + stack.shift();
|
||||
x = xb + (stack.length === 1 ? stack.shift() : 0);
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
|
|
@ -556,8 +560,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
|
|||
break;
|
||||
}
|
||||
|
||||
var xa = x, ya = y + stack.shift();
|
||||
var xb = xa + stack.shift(), yb = ya + stack.shift();
|
||||
xa = x; ya = y + stack.shift();
|
||||
xb = xa + stack.shift(); yb = ya + stack.shift();
|
||||
x = xb + stack.shift();
|
||||
y = yb + (stack.length === 1 ? stack.shift() : 0);
|
||||
bezierCurveTo(xa, ya, xb, yb, x, y);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue