Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix coding style in src/core/font_renderer.js

Browse Source
This commit is contained in:
Jonas Jenwald 2014-03-22 20:44:17 +01:00
parent 131a16b65e
commit 75de115938
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/font_renderer.js
View File

@ -29,8 +29,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
} }
function parseCmap(data, start, end) { function parseCmap(data, start, end) {
var offset = getUshort(data, start + 2) === 1 ? getLong(data, start + 8) : var offset = (getUshort(data, start + 2) === 1 ?
getLong(data, start + 16); getLong(data, start + 8) : getLong(data, start + 16));
var format = getUshort(data, start + offset); var format = getUshort(data, start + offset);
if (format === 4) { if (format === 4) {
var length = getUshort(data, start + offset + 2); var length = getUshort(data, start + offset + 2);
@ -79,13 +79,13 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
function parseCff(data, start, end) { function parseCff(data, start, end) {
var properties = {}; var properties = {};
var parser = new CFFParser( var parser = new CFFParser(new Stream(data, start, end - start),
new Stream(data, start, end - start), properties); properties);
var cff = parser.parse(); var cff = parser.parse();
return { return {
glyphs: cff.charStrings.objects, glyphs: cff.charStrings.objects,
subrs: cff.topDict.privateDict && cff.topDict.privateDict.subrsIndex && subrs: (cff.topDict.privateDict && cff.topDict.privateDict.subrsIndex &&
cff.topDict.privateDict.subrsIndex.objects, cff.topDict.privateDict.subrsIndex.objects),
gsubrs: cff.globalSubrIndex && cff.globalSubrIndex.objects gsubrs: cff.globalSubrIndex && cff.globalSubrIndex.objects
}; };
} }
@ -413,10 +413,11 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
var xa = x + stack.shift(), ya = y + stack.shift(); var xa = x + stack.shift(), ya = y + stack.shift();
var xb = xa + stack.shift(), yb = ya + stack.shift(); var xb = xa + stack.shift(), yb = ya + stack.shift();
x = xb; y = yb; x = xb; y = yb;
if (Math.abs(x - x0) > Math.abs(y - y0)) if (Math.abs(x - x0) > Math.abs(y - y0)) {
x += stack.shift(); x += stack.shift();
else } else {
y += stack.shift(); y += stack.shift();
}
bezierCurveTo(xa, ya, xb, yb, x, y); bezierCurveTo(xa, ya, xb, yb, x, y);
break; break;
default: default:
@ -562,15 +563,16 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
} }
break; break;
default: default:
if (v < 32) if (v < 32) {
error('unknown operator: ' + v); error('unknown operator: ' + v);
if (v < 247) }
if (v < 247) {
stack.push(v - 139); stack.push(v - 139);
else if (v < 251) } else if (v < 251) {
stack.push((v - 247) * 256 + code[i++] + 108); stack.push((v - 247) * 256 + code[i++] + 108);
else if (v < 255) } else if (v < 255) {
stack.push(-(v - 251) * 256 - code[i++] - 108); stack.push(-(v - 251) * 256 - code[i++] - 108);
else { } else {
stack.push(((code[i] << 24) | (code[i + 1] << 16) | stack.push(((code[i] << 24) | (code[i + 1] << 16) |
(code[i + 2] << 8) | code[i + 3]) / 65536); (code[i + 2] << 8) | code[i + 3]) / 65536);
i += 4; i += 4;
@ -654,10 +656,10 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
this.glyphNameMap = glyphNameMap || GlyphsUnicode; this.glyphNameMap = glyphNameMap || GlyphsUnicode;
this.compiledGlyphs = []; this.compiledGlyphs = [];
this.gsubrsBias = this.gsubrs.length < 1240 ? 107 : this.gsubrsBias = (this.gsubrs.length < 1240 ?
this.gsubrs.length < 33900 ? 1131 : 32768; 107 : (this.gsubrs.length < 33900 ? 1131 : 32768));
this.subrsBias = this.subrs.length < 1240 ? 107 : this.subrsBias = (this.subrs.length < 1240 ?
this.subrs.length < 33900 ? 1131 : 32768; 107 : (this.subrs.length < 33900 ? 1131 : 32768));
} }
Util.inherit(Type2Compiled, CompiledFont, { Util.inherit(Type2Compiled, CompiledFont, {
@ -697,8 +699,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
} }
if (glyf) { if (glyf) {
var fontMatrix = !unitsPerEm ? font.fontMatrix : var fontMatrix = (!unitsPerEm ? font.fontMatrix :
[1 / unitsPerEm, 0, 0, 1 / unitsPerEm, 0, 0]; [1 / unitsPerEm, 0, 0, 1 / unitsPerEm, 0, 0]);
return new TrueTypeCompiled( return new TrueTypeCompiled(
parseGlyfTable(glyf, loca, indexToLocFormat), cmap, fontMatrix); parseGlyfTable(glyf, loca, indexToLocFormat), cmap, fontMatrix);
} else { } else {