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

Merge pull request #5136 from timvandermeij/ccitt-lines

Browse Source 
Properly set this.eof in CCITTFaxStream
This commit is contained in:
Yury Delendik 2014-08-05 12:49:50 -05:00
commit 12b50486de
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/stream.js
View File

@ -2018,34 +2018,39 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
} }
} }
if (this.byteAlign) {
this.inputBits &= ~7;
}
var gotEOL = false; var gotEOL = false;
if (!this.eoblock && this.row === this.rows - 1) { if (!this.eoblock && this.row === this.rows - 1) {
this.eof = true; this.eof = true;
} else { } else if (this.eoline || !this.byteAlign) {
code1 = this.lookBits(12); code1 = this.lookBits(12);
while (code1 === 0) { if (this.eoline) {
this.eatBits(1); while (code1 !== EOF && code1 !== 1) {
code1 = this.lookBits(12); this.eatBits(1);
code1 = this.lookBits(12);
}
} else {
while (code1 === 0) {
this.eatBits(1);
code1 = this.lookBits(12);
}
} }
if (code1 === 1) { if (code1 === 1) {
this.eatBits(12); this.eatBits(12);
gotEOL = true; gotEOL = true;
} else if (code1 === EOF) {
this.eof = true;
} }
} }
if (this.byteAlign && !gotEOL) {
this.inputBits &= ~7;
}
if (!this.eof && this.encoding > 0) { if (!this.eof && this.encoding > 0) {
this.nextLine2D = !this.lookBits(1); this.nextLine2D = !this.lookBits(1);
this.eatBits(1); this.eatBits(1);
} }
if (this.eoblock && gotEOL) { if (this.eoblock && !this.eoline && this.byteAlign) {
code1 = this.lookBits(12); code1 = this.lookBits(12);
if (code1 === 1) { if (code1 === 1) {
this.eatBits(12); this.eatBits(12);