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

Merge pull request #8901 from janpe2/ccitt-eofb-false

Browse Source 
CCITTFaxStream problem when EndOfBlock is false
This commit is contained in:
Jonas Jenwald 2017-09-19 22:23:15 +02:00 committed by GitHub
commit fbd6e47aaf
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/stream.js
View File

@ -1787,6 +1787,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
this.inputBits = 0; this.inputBits = 0;
this.inputBuf = 0; this.inputBuf = 0;
this.outputBits = 0; this.outputBits = 0;
this.rowsDone = false;
var code1; var code1;
while ((code1 = this.lookBits(12)) === 0) { while ((code1 = this.lookBits(12)) === 0) {
@ -1872,6 +1873,9 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
var refPos, blackPixels, bits, i; var refPos, blackPixels, bits, i;
if (this.outputBits === 0) { if (this.outputBits === 0) {
if (this.rowsDone) {
this.eof = true;
}
if (this.eof) { if (this.eof) {
return null; return null;
} }
@ -2052,7 +2056,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
} }
if (!this.eoblock && this.row === this.rows - 1) { if (!this.eoblock && this.row === this.rows - 1) {
this.eof = true; this.rowsDone = true;
} else { } else {
code1 = this.lookBits(12); code1 = this.lookBits(12);
if (this.eoline) { if (this.eoline) {
@ -2074,7 +2078,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
} }
} }
if (!this.eof && this.encoding > 0) { if (!this.eof && this.encoding > 0 && !this.rowsDone) {
this.nextLine2D = !this.lookBits(1); this.nextLine2D = !this.lookBits(1);
this.eatBits(1); this.eatBits(1);
} }

1
test/pdfs/.gitignore vendored
View File

@ -297,3 +297,4 @@
!issue8097_reduced.pdf !issue8097_reduced.pdf
!transparent.pdf !transparent.pdf
!xobject-image.pdf !xobject-image.pdf
!ccitt_EndOfBlock_false.pdf

BIN
test/pdfs/ccitt_EndOfBlock_false.pdf Normal file
View File

Binary file not shown.

6
test/test_manifest.json
View File

@ -3693,5 +3693,11 @@
"rounds": 1, "rounds": 1,
"link": true, "link": true,
"type": "eq" "type": "eq"
},
{ "id": "ccitt_EndOfBlock_false",
"file": "pdfs/ccitt_EndOfBlock_false.pdf",
"md5": "ce718efe601cd7491dd00651b4790329",
"rounds": 1,
"type": "eq"
} }
] ]