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

Merge remote branch 'upstream/master' into refactor

Browse Source
This commit is contained in:
Vivien Nicolas 2011-09-08 03:16:35 +02:00
commit f014867bf8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pdf.js
View File

@ -592,17 +592,17 @@ var FlateStream = (function() {
var numCodeLenCodes = this.getBits(4) + 4; var numCodeLenCodes = this.getBits(4) + 4;
// build the code lengths code table // build the code lengths code table
var codeLenCodeLengths = Array(codeLenCodeMap.length); var codeLenCodeLengths = new Uint8Array(codeLenCodeMap.length);
var i = 0;
while (i < numCodeLenCodes) for (var i = 0; i < numCodeLenCodes; ++i)
codeLenCodeLengths[codeLenCodeMap[i++]] = this.getBits(3); codeLenCodeLengths[codeLenCodeMap[i]] = this.getBits(3);
var codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths); var codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths);
// build the literal and distance code tables // build the literal and distance code tables
var len = 0; var len = 0;
var i = 0; var i = 0;
var codes = numLitCodes + numDistCodes; var codes = numLitCodes + numDistCodes;
var codeLengths = new Array(codes); var codeLengths = new Uint8Array(codes);
while (i < codes) { while (i < codes) {
var code = this.getCode(codeLenCodeTab); var code = this.getCode(codeLenCodeTab);
if (code == 16) { if (code == 16) {
@ -617,9 +617,9 @@ var FlateStream = (function() {
} }
litCodeTable = litCodeTable =
this.generateHuffmanTable(codeLengths.slice(0, numLitCodes)); this.generateHuffmanTable(codeLengths.subarray(0, numLitCodes));
distCodeTable = distCodeTable =
this.generateHuffmanTable(codeLengths.slice(numLitCodes, codes)); this.generateHuffmanTable(codeLengths.subarray(numLitCodes, codes));
} else { } else {
error('Unknown block type in flate stream'); error('Unknown block type in flate stream');
} }
@ -4851,7 +4851,7 @@ var CanvasGraphics = (function() {
var italic = fontObj.italic ? 'italic' : 'normal'; var italic = fontObj.italic ? 'italic' : 'normal';
var serif = fontObj.serif ? 'serif' : 'sans-serif'; var serif = fontObj.serif ? 'serif' : 'sans-serif';
var typeface = '"' + name + '", ' + serif var typeface = '"' + name + '", ' + serif;
var rule = italic + ' ' + bold + ' ' + size + 'px ' + typeface; var rule = italic + ' ' + bold + ' ' + size + 'px ' + typeface;
this.ctx.font = rule; this.ctx.font = rule;
} }