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

Merge pull request #9756 from Snuffleupagus/Type1Parser-rm-makeSubStream

Browse Source 
Remove usage of `makeSubStream` from `Type1Parser.extractFontProgram` in src/core/type1_parser.js (issue 9735)
This commit is contained in:
Tim van der Meij 2018-05-28 23:34:57 +02:00 committed by GitHub
commit c5d5d29b03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/type1_parser.js
View File

@ -559,11 +559,9 @@ var Type1Parser = (function Type1ParserClosure() {
var glyph = this.getToken(); var glyph = this.getToken();
length = this.readInt(); length = this.readInt();
this.getToken(); // read in 'RD' or '-|' this.getToken(); // read in 'RD' or '-|'
data = stream.makeSubStream(stream.pos, length); data = (length > 0 ? stream.getBytes(length) : new Uint8Array(0));
lenIV = program.properties.privateData['lenIV']; lenIV = program.properties.privateData['lenIV'];
encoded = this.readCharStrings(data.getBytes(), lenIV); encoded = this.readCharStrings(data, lenIV);
// Skip past the required space and binary data.
stream.skip(length);
this.nextChar(); this.nextChar();
token = this.getToken(); // read in 'ND' or '|-' token = this.getToken(); // read in 'ND' or '|-'
if (token === 'noaccess') { if (token === 'noaccess') {
@ -582,11 +580,9 @@ var Type1Parser = (function Type1ParserClosure() {
var index = this.readInt(); var index = this.readInt();
length = this.readInt(); length = this.readInt();
this.getToken(); // read in 'RD' or '-|' this.getToken(); // read in 'RD' or '-|'
data = stream.makeSubStream(stream.pos, length); data = (length > 0 ? stream.getBytes(length) : new Uint8Array(0));
lenIV = program.properties.privateData['lenIV']; lenIV = program.properties.privateData['lenIV'];
encoded = this.readCharStrings(data.getBytes(), lenIV); encoded = this.readCharStrings(data, lenIV);
// Skip past the required space and binary data.
stream.skip(length);
this.nextChar(); this.nextChar();
token = this.getToken(); // read in 'NP' or '|' token = this.getToken(); // read in 'NP' or '|'
if (token === 'noaccess') { if (token === 'noaccess') {