|
@@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfCombined = {}));
|
|
|
// Use strict in our context only - users might not want it
|
|
|
'use strict';
|
|
|
|
|
|
-var pdfjsVersion = '1.4.145';
|
|
|
-var pdfjsBuild = '4a44a2c';
|
|
|
+var pdfjsVersion = '1.4.147';
|
|
|
+var pdfjsBuild = '54ee15d';
|
|
|
|
|
|
var pdfjsFilePath =
|
|
|
typeof document !== 'undefined' && document.currentScript ?
|
|
@@ -21508,10 +21508,6 @@ var Jbig2Image = coreJbig2.Jbig2Image;
|
|
|
var JpegImage = coreJpg.JpegImage;
|
|
|
var JpxImage = coreJpx.JpxImage;
|
|
|
|
|
|
-var coreParser; // see _setCoreParser below
|
|
|
-var EOF; // = coreParser.EOF;
|
|
|
-var Lexer; // = coreParser.Lexer;
|
|
|
-
|
|
|
var coreColorSpace; // see _setCoreColorSpace below
|
|
|
var ColorSpace; // = coreColorSpace.ColorSpace;
|
|
|
|
|
@@ -22633,6 +22629,11 @@ var DecryptStream = (function DecryptStreamClosure() {
|
|
|
})();
|
|
|
|
|
|
var Ascii85Stream = (function Ascii85StreamClosure() {
|
|
|
+ // Checks if ch is one of the following characters: SPACE, TAB, CR or LF.
|
|
|
+ function isSpace(ch) {
|
|
|
+ return (ch === 0x20 || ch === 0x09 || ch === 0x0D || ch === 0x0A);
|
|
|
+ }
|
|
|
+
|
|
|
function Ascii85Stream(str, maybeLength) {
|
|
|
this.str = str;
|
|
|
this.dict = str.dict;
|
|
@@ -22656,7 +22657,7 @@ var Ascii85Stream = (function Ascii85StreamClosure() {
|
|
|
var str = this.str;
|
|
|
|
|
|
var c = str.getByte();
|
|
|
- while (Lexer.isSpace(c)) {
|
|
|
+ while (isSpace(c)) {
|
|
|
c = str.getByte();
|
|
|
}
|
|
|
|
|
@@ -22680,7 +22681,7 @@ var Ascii85Stream = (function Ascii85StreamClosure() {
|
|
|
input[0] = c;
|
|
|
for (i = 1; i < 5; ++i) {
|
|
|
c = str.getByte();
|
|
|
- while (Lexer.isSpace(c)) {
|
|
|
+ while (isSpace(c)) {
|
|
|
c = str.getByte();
|
|
|
}
|
|
|
|
|
@@ -22827,6 +22828,7 @@ var RunLengthStream = (function RunLengthStreamClosure() {
|
|
|
var CCITTFaxStream = (function CCITTFaxStreamClosure() {
|
|
|
|
|
|
var ccittEOL = -2;
|
|
|
+ var ccittEOF = -1;
|
|
|
var twoDimPass = 0;
|
|
|
var twoDimHoriz = 1;
|
|
|
var twoDimVert0 = 2;
|
|
@@ -23509,7 +23511,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
- case EOF:
|
|
|
+ case ccittEOF:
|
|
|
this.addPixels(columns, 0);
|
|
|
this.eof = true;
|
|
|
break;
|
|
@@ -23550,7 +23552,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
|
|
|
} else {
|
|
|
code1 = this.lookBits(12);
|
|
|
if (this.eoline) {
|
|
|
- while (code1 !== EOF && code1 !== 1) {
|
|
|
+ while (code1 !== ccittEOF && code1 !== 1) {
|
|
|
this.eatBits(1);
|
|
|
code1 = this.lookBits(12);
|
|
|
}
|
|
@@ -23563,7 +23565,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
|
|
|
if (code1 === 1) {
|
|
|
this.eatBits(12);
|
|
|
gotEOL = true;
|
|
|
- } else if (code1 === EOF) {
|
|
|
+ } else if (code1 === ccittEOF) {
|
|
|
this.eof = true;
|
|
|
}
|
|
|
}
|
|
@@ -23599,7 +23601,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
|
|
|
} else if (this.err && this.eoline) {
|
|
|
while (true) {
|
|
|
code1 = this.lookBits(13);
|
|
|
- if (code1 === EOF) {
|
|
|
+ if (code1 === ccittEOF) {
|
|
|
this.eof = true;
|
|
|
return null;
|
|
|
}
|
|
@@ -23679,7 +23681,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
|
|
|
var limitValue = limit || 0;
|
|
|
for (var i = start; i <= end; ++i) {
|
|
|
var code = this.lookBits(i);
|
|
|
- if (code === EOF) {
|
|
|
+ if (code === ccittEOF) {
|
|
|
return [true, 1, false];
|
|
|
}
|
|
|
if (i < end) {
|
|
@@ -23715,7 +23717,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
|
|
|
}
|
|
|
}
|
|
|
info('Bad two dim code');
|
|
|
- return EOF;
|
|
|
+ return ccittEOF;
|
|
|
};
|
|
|
|
|
|
CCITTFaxStream.prototype.getWhiteCode =
|
|
@@ -23725,7 +23727,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
|
|
|
var p;
|
|
|
if (this.eoblock) {
|
|
|
code = this.lookBits(12);
|
|
|
- if (code === EOF) {
|
|
|
+ if (code === ccittEOF) {
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
@@ -23761,7 +23763,7 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
|
|
|
var code, p;
|
|
|
if (this.eoblock) {
|
|
|
code = this.lookBits(13);
|
|
|
- if (code === EOF) {
|
|
|
+ if (code === ccittEOF) {
|
|
|
return 1;
|
|
|
}
|
|
|
if ((code >> 7) === 0) {
|
|
@@ -23802,12 +23804,12 @@ var CCITTFaxStream = (function CCITTFaxStreamClosure() {
|
|
|
while (this.inputBits < n) {
|
|
|
if ((c = this.str.getByte()) === -1) {
|
|
|
if (this.inputBits === 0) {
|
|
|
- return EOF;
|
|
|
+ return ccittEOF;
|
|
|
}
|
|
|
return ((this.inputBuf << (n - this.inputBits)) &
|
|
|
(0xFFFF >> (16 - n)));
|
|
|
}
|
|
|
- this.inputBuf = (this.inputBuf << 8) + c;
|
|
|
+ this.inputBuf = (this.inputBuf << 8) | c;
|
|
|
this.inputBits += 8;
|
|
|
}
|
|
|
return (this.inputBuf >> (this.inputBits - n)) & (0xFFFF >> (16 - n));
|
|
@@ -23963,14 +23965,6 @@ var NullStream = (function NullStreamClosure() {
|
|
|
return NullStream;
|
|
|
})();
|
|
|
|
|
|
-// TODO refactor to remove dependency on parser.js
|
|
|
-function _setCoreParser(coreParser_) {
|
|
|
- coreParser = coreParser_;
|
|
|
- EOF = coreParser_.EOF;
|
|
|
- Lexer = coreParser_.Lexer;
|
|
|
-}
|
|
|
-exports._setCoreParser = _setCoreParser;
|
|
|
-
|
|
|
// TODO refactor to remove dependency on colorspace.js
|
|
|
function _setCoreColorSpace(coreColorSpace_) {
|
|
|
coreColorSpace = coreColorSpace_;
|
|
@@ -28319,9 +28313,6 @@ exports.Lexer = Lexer;
|
|
|
exports.Linearization = Linearization;
|
|
|
exports.Parser = Parser;
|
|
|
exports.isEOF = isEOF;
|
|
|
-
|
|
|
-// TODO refactor to remove dependency on stream.js
|
|
|
-coreStream._setCoreParser(exports);
|
|
|
}));
|
|
|
|
|
|
|