akira
/
pdfjs-dist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PDF.js version 2.0.345 - See mozilla/pdf.js@7bb066494f3f15c396941c3532b83da6d3465c6b

master v2.0.345
pdfjsbot 7 years ago
parent
9679c6fa22
commit
d9fc7a4a58
17 changed files with 339 additions and 195 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bower.json
  2. 42
      build/pdf.js
  3. 2
      build/pdf.js.map
  4. 2
      build/pdf.min.js
  5. 226
      build/pdf.worker.js
  6. 2
      build/pdf.worker.js.map
  7. 2
      build/pdf.worker.min.js
  8. 157
      lib/core/evaluator.js
  9. 5
      lib/core/image.js
  10. 44
      lib/core/jpg.js
  11. 2
      lib/core/worker.js
  12. 20
      lib/display/api.js
  13. 4
      lib/display/global.js
  14. 4
      lib/pdf.js
  15. 4
      lib/pdf.worker.js
  16. 14
      lib/shared/util.js
  17. 2
      package.json

2
bower.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "pdfjs-dist", "name": "pdfjs-dist",
"version": "2.0.338", "version": "2.0.345",
"main": [ "main": [
"build/pdf.js", "build/pdf.js",
"build/pdf.worker.js" "build/pdf.worker.js"

42
build/pdf.js
Unescape View File

@ -105,7 +105,7 @@ return /******/ (function(modules) { // webpackBootstrap
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
value: true value: true
}); });
exports.unreachable = exports.warn = exports.utf8StringToString = exports.stringToUTF8String = exports.stringToPDFString = exports.stringToBytes = exports.string32 = exports.shadow = exports.setVerbosityLevel = exports.ReadableStream = exports.removeNullCharacters = exports.readUint32 = exports.readUint16 = exports.readInt8 = exports.log2 = exports.loadJpegStream = exports.isEvalSupported = exports.isLittleEndian = exports.createValidAbsoluteUrl = exports.isSameOrigin = exports.isSpace = exports.isString = exports.isNum = exports.isEmptyObj = exports.isBool = exports.isArrayBuffer = exports.info = exports.getVerbosityLevel = exports.getLookupTableFactory = exports.deprecated = exports.createObjectURL = exports.createPromiseCapability = exports.createBlob = exports.bytesToString = exports.assert = exports.arraysToBytes = exports.arrayByteLength = exports.FormatError = exports.XRefParseException = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PasswordResponses = exports.PasswordException = exports.PageViewport = exports.NotImplementedException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.MessageHandler = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VERBOSITY_LEVELS = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = undefined; exports.unreachable = exports.warn = exports.utf8StringToString = exports.stringToUTF8String = exports.stringToPDFString = exports.stringToBytes = exports.string32 = exports.shadow = exports.setVerbosityLevel = exports.ReadableStream = exports.removeNullCharacters = exports.readUint32 = exports.readUint16 = exports.readInt8 = exports.log2 = exports.isEvalSupported = exports.isLittleEndian = exports.createValidAbsoluteUrl = exports.isSameOrigin = exports.isSpace = exports.isString = exports.isNum = exports.isEmptyObj = exports.isBool = exports.isArrayBuffer = exports.info = exports.getVerbosityLevel = exports.getLookupTableFactory = exports.deprecated = exports.createObjectURL = exports.createPromiseCapability = exports.createBlob = exports.bytesToString = exports.assert = exports.arraysToBytes = exports.arrayByteLength = exports.FormatError = exports.XRefParseException = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PasswordResponses = exports.PasswordException = exports.PageViewport = exports.NotImplementedException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.MessageHandler = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VERBOSITY_LEVELS = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = undefined;
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@ -1338,17 +1338,6 @@ MessageHandler.prototype = {
this.comObj.removeEventListener('message', this._onComObjOnMessage); this.comObj.removeEventListener('message', this._onComObjOnMessage);
} }
}; };
function loadJpegStream(id, imageUrl, objs) {
var img = new Image();
img.onload = function loadJpegStream_onloadClosure() {
objs.resolve(id, img);
};
img.onerror = function loadJpegStream_onerrorClosure() {
objs.resolve(id, null);
warn('Error during JPEG image loading');
};
img.src = imageUrl;
}
exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX; exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
exports.IDENTITY_MATRIX = IDENTITY_MATRIX; exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
exports.OPS = OPS; exports.OPS = OPS;
@ -1399,7 +1388,6 @@ exports.isSameOrigin = isSameOrigin;
exports.createValidAbsoluteUrl = createValidAbsoluteUrl; exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
exports.isLittleEndian = isLittleEndian; exports.isLittleEndian = isLittleEndian;
exports.isEvalSupported = isEvalSupported; exports.isEvalSupported = isEvalSupported;
exports.loadJpegStream = loadJpegStream;
exports.log2 = log2; exports.log2 = log2;
exports.readInt8 = readInt8; exports.readInt8 = readInt8;
exports.readUint16 = readUint16; exports.readUint16 = readUint16;
@ -3311,7 +3299,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
if (worker.destroyed) { if (worker.destroyed) {
return Promise.reject(new Error('Worker was destroyed')); return Promise.reject(new Error('Worker was destroyed'));
} }
var apiVersion = '2.0.338'; var apiVersion = '2.0.345';
source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange'); source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch'); source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream'); source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
@ -4310,8 +4298,18 @@ var WorkerTransport = function WorkerTransportClosure() {
switch (type) { switch (type) {
case 'JpegStream': case 'JpegStream':
imageData = data[3]; imageData = data[3];
(0, _util.loadJpegStream)(id, imageData, pageProxy.objs); return new Promise(function (resolve, reject) {
break; var img = new Image();
img.onload = function () {
resolve(img);
};
img.onerror = function () {
reject(new Error('Error during JPEG image loading'));
};
img.src = imageData;
}).then(function (img) {
pageProxy.objs.resolve(id, img);
});
case 'Image': case 'Image':
imageData = data[3]; imageData = data[3];
pageProxy.objs.resolve(id, imageData); pageProxy.objs.resolve(id, imageData);
@ -4700,8 +4698,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}(); }();
var version, build; var version, build;
{ {
exports.version = version = '2.0.338'; exports.version = version = '2.0.345';
exports.build = build = '25293628'; exports.build = build = '7bb06649';
} }
exports.getDocument = getDocument; exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort; exports.LoopbackPort = LoopbackPort;
@ -7459,8 +7457,8 @@ exports.SVGGraphics = SVGGraphics;
"use strict"; "use strict";
var pdfjsVersion = '2.0.338'; var pdfjsVersion = '2.0.345';
var pdfjsBuild = '25293628'; var pdfjsBuild = '7bb06649';
var pdfjsSharedUtil = __w_pdfjs_require__(0); var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(120); var pdfjsDisplayGlobal = __w_pdfjs_require__(120);
var pdfjsDisplayAPI = __w_pdfjs_require__(58); var pdfjsDisplayAPI = __w_pdfjs_require__(58);
@ -12745,8 +12743,8 @@ if (!_global_scope2.default.PDFJS) {
} }
var PDFJS = _global_scope2.default.PDFJS; var PDFJS = _global_scope2.default.PDFJS;
{ {
PDFJS.version = '2.0.338'; PDFJS.version = '2.0.345';
PDFJS.build = '25293628'; PDFJS.build = '7bb06649';
} }
PDFJS.pdfBug = false; PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) { if (PDFJS.verbosity !== undefined) {

2
build/pdf.js.map
View File

File diff suppressed because one or more lines are too long

2
build/pdf.min.js vendored
View File

File diff suppressed because one or more lines are too long

226
build/pdf.worker.js vendored
Unescape View File

@ -105,7 +105,7 @@ return /******/ (function(modules) { // webpackBootstrap
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
value: true value: true
}); });
exports.unreachable = exports.warn = exports.utf8StringToString = exports.stringToUTF8String = exports.stringToPDFString = exports.stringToBytes = exports.string32 = exports.shadow = exports.setVerbosityLevel = exports.ReadableStream = exports.removeNullCharacters = exports.readUint32 = exports.readUint16 = exports.readInt8 = exports.log2 = exports.loadJpegStream = exports.isEvalSupported = exports.isLittleEndian = exports.createValidAbsoluteUrl = exports.isSameOrigin = exports.isSpace = exports.isString = exports.isNum = exports.isEmptyObj = exports.isBool = exports.isArrayBuffer = exports.info = exports.getVerbosityLevel = exports.getLookupTableFactory = exports.deprecated = exports.createObjectURL = exports.createPromiseCapability = exports.createBlob = exports.bytesToString = exports.assert = exports.arraysToBytes = exports.arrayByteLength = exports.FormatError = exports.XRefParseException = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PasswordResponses = exports.PasswordException = exports.PageViewport = exports.NotImplementedException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.MessageHandler = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VERBOSITY_LEVELS = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = undefined; exports.unreachable = exports.warn = exports.utf8StringToString = exports.stringToUTF8String = exports.stringToPDFString = exports.stringToBytes = exports.string32 = exports.shadow = exports.setVerbosityLevel = exports.ReadableStream = exports.removeNullCharacters = exports.readUint32 = exports.readUint16 = exports.readInt8 = exports.log2 = exports.isEvalSupported = exports.isLittleEndian = exports.createValidAbsoluteUrl = exports.isSameOrigin = exports.isSpace = exports.isString = exports.isNum = exports.isEmptyObj = exports.isBool = exports.isArrayBuffer = exports.info = exports.getVerbosityLevel = exports.getLookupTableFactory = exports.deprecated = exports.createObjectURL = exports.createPromiseCapability = exports.createBlob = exports.bytesToString = exports.assert = exports.arraysToBytes = exports.arrayByteLength = exports.FormatError = exports.XRefParseException = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PasswordResponses = exports.PasswordException = exports.PageViewport = exports.NotImplementedException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.MessageHandler = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VERBOSITY_LEVELS = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = undefined;
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@ -1338,17 +1338,6 @@ MessageHandler.prototype = {
this.comObj.removeEventListener('message', this._onComObjOnMessage); this.comObj.removeEventListener('message', this._onComObjOnMessage);
} }
}; };
function loadJpegStream(id, imageUrl, objs) {
var img = new Image();
img.onload = function loadJpegStream_onloadClosure() {
objs.resolve(id, img);
};
img.onerror = function loadJpegStream_onerrorClosure() {
objs.resolve(id, null);
warn('Error during JPEG image loading');
};
img.src = imageUrl;
}
exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX; exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
exports.IDENTITY_MATRIX = IDENTITY_MATRIX; exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
exports.OPS = OPS; exports.OPS = OPS;
@ -1399,7 +1388,6 @@ exports.isSameOrigin = isSameOrigin;
exports.createValidAbsoluteUrl = createValidAbsoluteUrl; exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
exports.isLittleEndian = isLittleEndian; exports.isLittleEndian = isLittleEndian;
exports.isEvalSupported = isEvalSupported; exports.isEvalSupported = isEvalSupported;
exports.loadJpegStream = loadJpegStream;
exports.log2 = log2; exports.log2 = log2;
exports.readInt8 = readInt8; exports.readInt8 = readInt8;
exports.readUint16 = readUint16; exports.readUint16 = readUint16;
@ -22307,8 +22295,8 @@ exports.PostScriptCompiler = PostScriptCompiler;
"use strict"; "use strict";
var pdfjsVersion = '2.0.338'; var pdfjsVersion = '2.0.345';
var pdfjsBuild = '25293628'; var pdfjsBuild = '7bb06649';
var pdfjsCoreWorker = __w_pdfjs_require__(74); var pdfjsCoreWorker = __w_pdfjs_require__(74);
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler; exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
@ -22521,7 +22509,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null; var cancelXHRs = null;
var WorkerTasks = []; var WorkerTasks = [];
var apiVersion = docParams.apiVersion; var apiVersion = docParams.apiVersion;
var workerVersion = '2.0.338'; var workerVersion = '2.0.345';
if (apiVersion !== null && apiVersion !== workerVersion) { if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".')); throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
} }
@ -30799,6 +30787,16 @@ var JpegError = function JpegErrorClosure() {
JpegError.constructor = JpegError; JpegError.constructor = JpegError;
return JpegError; return JpegError;
}(); }();
var DNLMarkerError = function DNLMarkerErrorClosure() {
function DNLMarkerError(message, scanLines) {
this.message = message;
this.scanLines = scanLines;
}
DNLMarkerError.prototype = new Error();
DNLMarkerError.prototype.name = 'DNLMarkerError';
DNLMarkerError.constructor = DNLMarkerError;
return DNLMarkerError;
}();
var JpegImage = function JpegImageClosure() { var JpegImage = function JpegImageClosure() {
var dctZigZag = new Uint8Array([0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63]); var dctZigZag = new Uint8Array([0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63]);
var dctCos1 = 4017; var dctCos1 = 4017;
@ -30862,6 +30860,8 @@ var JpegImage = function JpegImageClosure() {
return 64 * ((component.blocksPerLine + 1) * row + col); return 64 * ((component.blocksPerLine + 1) * row + col);
} }
function decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successivePrev, successive) { function decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successivePrev, successive) {
var parseDNLMarker = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
var mcusPerLine = frame.mcusPerLine; var mcusPerLine = frame.mcusPerLine;
var progressive = frame.progressive; var progressive = frame.progressive;
var startOffset = offset, var startOffset = offset,
@ -30876,6 +30876,13 @@ var JpegImage = function JpegImageClosure() {
if (bitsData === 0xFF) { if (bitsData === 0xFF) {
var nextByte = data[offset++]; var nextByte = data[offset++];
if (nextByte) { if (nextByte) {
if (nextByte === 0xDC && parseDNLMarker) {
offset += 2;
var scanLines = data[offset++] << 8 | data[offset++];
if (scanLines > 0 && scanLines !== frame.scanLines) {
throw new DNLMarkerError('Found DNL marker (0xFFDC) while parsing scan data', scanLines);
}
}
throw new JpegError('unexpected marker ' + (bitsData << 8 | nextByte).toString(16)); throw new JpegError('unexpected marker ' + (bitsData << 8 | nextByte).toString(16));
} }
} }
@ -31314,6 +31321,10 @@ var JpegImage = function JpegImageClosure() {
} }
JpegImage.prototype = { JpegImage.prototype = {
parse: function parse(data) { parse: function parse(data) {
var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
_ref$dnlScanLines = _ref.dnlScanLines,
dnlScanLines = _ref$dnlScanLines === undefined ? null : _ref$dnlScanLines;
function readUint16() { function readUint16() {
var value = data[offset] << 8 | data[offset + 1]; var value = data[offset] << 8 | data[offset + 1];
offset += 2; offset += 2;
@ -31352,6 +31363,7 @@ var JpegImage = function JpegImageClosure() {
var jfif = null; var jfif = null;
var adobe = null; var adobe = null;
var frame, resetInterval; var frame, resetInterval;
var numSOSMarkers = 0;
var quantizationTables = []; var quantizationTables = [];
var huffmanTablesAC = [], var huffmanTablesAC = [],
huffmanTablesDC = []; huffmanTablesDC = [];
@ -31442,7 +31454,8 @@ var JpegImage = function JpegImageClosure() {
frame.extended = fileMarker === 0xFFC1; frame.extended = fileMarker === 0xFFC1;
frame.progressive = fileMarker === 0xFFC2; frame.progressive = fileMarker === 0xFFC2;
frame.precision = data[offset++]; frame.precision = data[offset++];
frame.scanLines = readUint16(); var sofScanLines = readUint16();
frame.scanLines = dnlScanLines || sofScanLines;
frame.samplesPerLine = readUint16(); frame.samplesPerLine = readUint16();
frame.components = []; frame.components = [];
frame.componentIds = {}; frame.componentIds = {};
@ -31496,6 +31509,7 @@ var JpegImage = function JpegImageClosure() {
resetInterval = readUint16(); resetInterval = readUint16();
break; break;
case 0xFFDA: case 0xFFDA:
var parseDNLMarker = ++numSOSMarkers === 1 && !dnlScanLines;
readUint16(); readUint16();
var selectorsCount = data[offset++]; var selectorsCount = data[offset++];
var components = [], var components = [],
@ -31511,8 +31525,19 @@ var JpegImage = function JpegImageClosure() {
var spectralStart = data[offset++]; var spectralStart = data[offset++];
var spectralEnd = data[offset++]; var spectralEnd = data[offset++];
var successiveApproximation = data[offset++]; var successiveApproximation = data[offset++];
var processed = decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successiveApproximation >> 4, successiveApproximation & 15); try {
offset += processed; var processed = decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successiveApproximation >> 4, successiveApproximation & 15, parseDNLMarker);
offset += processed;
} catch (ex) {
if (ex instanceof DNLMarkerError) {
(0, _util.warn)('Attempting to re-parse JPEG image using "scanLines" ' + 'parameter found in DNL marker (0xFFDC) segment.');
return this.parse(data, { dnlScanLines: ex.scanLines });
}
throw ex;
}
break;
case 0xFFDC:
offset += 4;
break; break;
case 0xFFFF: case 0xFFFF:
if (data[offset] !== 0xFF) { if (data[offset] !== 0xFF) {
@ -31555,6 +31580,7 @@ var JpegImage = function JpegImageClosure() {
} }
this.numComponents = this.components.length; this.numComponents = this.components.length;
}, },
_getLinearizedBlockData: function getLinearizedBlockData(width, height) { _getLinearizedBlockData: function getLinearizedBlockData(width, height) {
var scaleX = this.width / width, var scaleX = this.width / width,
scaleY = this.height / height; scaleY = this.height / height;
@ -32786,10 +32812,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var dict = image.dict; var dict = image.dict;
var colorSpace = dict.get('ColorSpace', 'CS'); var colorSpace = dict.get('ColorSpace', 'CS');
colorSpace = _colorspace.ColorSpace.parse(colorSpace, this.xref, this.resources, this.pdfFunctionFactory); colorSpace = _colorspace.ColorSpace.parse(colorSpace, this.xref, this.resources, this.pdfFunctionFactory);
var numComps = colorSpace.numComps; return this.handler.sendWithPromise('JpegDecode', [image.getIR(this.forceDataSchema), colorSpace.numComps]).then(function (_ref2) {
var decodePromise = this.handler.sendWithPromise('JpegDecode', [image.getIR(this.forceDataSchema), numComps]); var data = _ref2.data,
return decodePromise.then(function (message) { width = _ref2.width,
var data = message.data; height = _ref2.height;
return new _stream.Stream(data, 0, data.length, image.dict); return new _stream.Stream(data, 0, data.length, image.dict);
}); });
} }
@ -32810,19 +32837,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var cs = _colorspace.ColorSpace.parse(dict.get('ColorSpace', 'CS'), xref, res, pdfFunctionFactory); var cs = _colorspace.ColorSpace.parse(dict.get('ColorSpace', 'CS'), xref, res, pdfFunctionFactory);
return (cs.numComps === 1 || cs.numComps === 3) && cs.isDefaultDecode(dict.getArray('Decode', 'D')); return (cs.numComps === 1 || cs.numComps === 3) && cs.isDefaultDecode(dict.getArray('Decode', 'D'));
}; };
function PartialEvaluator(_ref2) { function PartialEvaluator(_ref3) {
var _this = this; var _this = this;
var pdfManager = _ref2.pdfManager, var pdfManager = _ref3.pdfManager,
xref = _ref2.xref, xref = _ref3.xref,
handler = _ref2.handler, handler = _ref3.handler,
pageIndex = _ref2.pageIndex, pageIndex = _ref3.pageIndex,
idFactory = _ref2.idFactory, idFactory = _ref3.idFactory,
fontCache = _ref2.fontCache, fontCache = _ref3.fontCache,
builtInCMapCache = _ref2.builtInCMapCache, builtInCMapCache = _ref3.builtInCMapCache,
_ref2$options = _ref2.options, _ref3$options = _ref3.options,
options = _ref2$options === undefined ? null : _ref2$options, options = _ref3$options === undefined ? null : _ref3$options,
pdfFunctionFactory = _ref2.pdfFunctionFactory; pdfFunctionFactory = _ref3.pdfFunctionFactory;
this.pdfManager = pdfManager; this.pdfManager = pdfManager;
this.xref = xref; this.xref = xref;
@ -33019,20 +33046,30 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
} }
}); });
}, },
buildPaintImageXObject: function PartialEvaluator_buildPaintImageXObject(resources, image, inline, operatorList, cacheKey, imageCache) { buildPaintImageXObject: function buildPaintImageXObject(_ref4) {
var _this2 = this; var _this2 = this;
var resources = _ref4.resources,
image = _ref4.image,
_ref4$isInline = _ref4.isInline,
isInline = _ref4$isInline === undefined ? false : _ref4$isInline,
operatorList = _ref4.operatorList,
cacheKey = _ref4.cacheKey,
imageCache = _ref4.imageCache,
_ref4$forceDisableNat = _ref4.forceDisableNativeImageDecoder,
forceDisableNativeImageDecoder = _ref4$forceDisableNat === undefined ? false : _ref4$forceDisableNat;
var dict = image.dict; var dict = image.dict;
var w = dict.get('Width', 'W'); var w = dict.get('Width', 'W');
var h = dict.get('Height', 'H'); var h = dict.get('Height', 'H');
if (!(w && (0, _util.isNum)(w)) || !(h && (0, _util.isNum)(h))) { if (!(w && (0, _util.isNum)(w)) || !(h && (0, _util.isNum)(h))) {
(0, _util.warn)('Image dimensions are missing, or not numbers.'); (0, _util.warn)('Image dimensions are missing, or not numbers.');
return; return Promise.resolve();
} }
var maxImageSize = this.options.maxImageSize; var maxImageSize = this.options.maxImageSize;
if (maxImageSize !== -1 && w * h > maxImageSize) { if (maxImageSize !== -1 && w * h > maxImageSize) {
(0, _util.warn)('Image exceeded maximum allowed size and was removed.'); (0, _util.warn)('Image exceeded maximum allowed size and was removed.');
return; return Promise.resolve();
} }
var imageMask = dict.get('ImageMask', 'IM') || false; var imageMask = dict.get('ImageMask', 'IM') || false;
var imgData, args; var imgData, args;
@ -33058,37 +33095,48 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
args: args args: args
}; };
} }
return; return Promise.resolve();
} }
var softMask = dict.get('SMask', 'SM') || false; var softMask = dict.get('SMask', 'SM') || false;
var mask = dict.get('Mask') || false; var mask = dict.get('Mask') || false;
var SMALL_IMAGE_DIMENSIONS = 200; var SMALL_IMAGE_DIMENSIONS = 200;
if (inline && !softMask && !mask && !(image instanceof _jpeg_stream.JpegStream) && w + h < SMALL_IMAGE_DIMENSIONS) { if (isInline && !softMask && !mask && !(image instanceof _jpeg_stream.JpegStream) && w + h < SMALL_IMAGE_DIMENSIONS) {
var imageObj = new _image.PDFImage({ var imageObj = new _image.PDFImage({
xref: this.xref, xref: this.xref,
res: resources, res: resources,
image: image, image: image,
isInline: inline, isInline: isInline,
pdfFunctionFactory: this.pdfFunctionFactory pdfFunctionFactory: this.pdfFunctionFactory
}); });
imgData = imageObj.createImageData(true); imgData = imageObj.createImageData(true);
operatorList.addOp(_util.OPS.paintInlineImageXObject, [imgData]); operatorList.addOp(_util.OPS.paintInlineImageXObject, [imgData]);
return; return Promise.resolve();
} }
var nativeImageDecoderSupport = this.options.nativeImageDecoderSupport; var nativeImageDecoderSupport = forceDisableNativeImageDecoder ? _util.NativeImageDecoding.NONE : this.options.nativeImageDecoderSupport;
var objId = 'img_' + this.idFactory.createObjId(); var objId = 'img_' + this.idFactory.createObjId();
operatorList.addDependency(objId);
args = [objId, w, h];
if (nativeImageDecoderSupport !== _util.NativeImageDecoding.NONE && !softMask && !mask && image instanceof _jpeg_stream.JpegStream && NativeImageDecoder.isSupported(image, this.xref, resources, this.pdfFunctionFactory)) { if (nativeImageDecoderSupport !== _util.NativeImageDecoding.NONE && !softMask && !mask && image instanceof _jpeg_stream.JpegStream && NativeImageDecoder.isSupported(image, this.xref, resources, this.pdfFunctionFactory)) {
operatorList.addOp(_util.OPS.paintJpegXObject, args); return this.handler.sendWithPromise('obj', [objId, this.pageIndex, 'JpegStream', image.getIR(this.options.forceDataSchema)]).then(function () {
this.handler.send('obj', [objId, this.pageIndex, 'JpegStream', image.getIR(this.options.forceDataSchema)]); operatorList.addDependency(objId);
if (cacheKey) { args = [objId, w, h];
imageCache[cacheKey] = { operatorList.addOp(_util.OPS.paintJpegXObject, args);
fn: _util.OPS.paintJpegXObject, if (cacheKey) {
args: args imageCache[cacheKey] = {
}; fn: _util.OPS.paintJpegXObject,
} args: args
return; };
}
}, function (reason) {
(0, _util.warn)('Native JPEG decoding failed -- trying to recover: ' + (reason && reason.message));
return _this2.buildPaintImageXObject({
resources: resources,
image: image,
isInline: isInline,
operatorList: operatorList,
cacheKey: cacheKey,
imageCache: imageCache,
forceDisableNativeImageDecoder: true
});
});
} }
var nativeImageDecoder = null; var nativeImageDecoder = null;
if (nativeImageDecoderSupport === _util.NativeImageDecoding.DECODE && (image instanceof _jpeg_stream.JpegStream || mask instanceof _jpeg_stream.JpegStream || softMask instanceof _jpeg_stream.JpegStream)) { if (nativeImageDecoderSupport === _util.NativeImageDecoding.DECODE && (image instanceof _jpeg_stream.JpegStream || mask instanceof _jpeg_stream.JpegStream || softMask instanceof _jpeg_stream.JpegStream)) {
@ -33100,12 +33148,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
pdfFunctionFactory: this.pdfFunctionFactory pdfFunctionFactory: this.pdfFunctionFactory
}); });
} }
operatorList.addDependency(objId);
args = [objId, w, h];
_image.PDFImage.buildImage({ _image.PDFImage.buildImage({
handler: this.handler, handler: this.handler,
xref: this.xref, xref: this.xref,
res: resources, res: resources,
image: image, image: image,
isInline: inline, isInline: isInline,
nativeDecoder: nativeImageDecoder, nativeDecoder: nativeImageDecoder,
pdfFunctionFactory: this.pdfFunctionFactory pdfFunctionFactory: this.pdfFunctionFactory
}).then(function (imageObj) { }).then(function (imageObj) {
@ -33122,7 +33172,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
args: args args: args
}; };
} }
return Promise.resolve();
}, },
handleSMask: function PartialEvaluator_handleSmask(smask, resources, operatorList, task, stateManager) { handleSMask: function PartialEvaluator_handleSmask(smask, resources, operatorList, task, stateManager) {
var smaskContent = smask.get('G'); var smaskContent = smask.get('G');
var smaskOptions = { var smaskOptions = {
@ -33435,15 +33487,15 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
operatorList.addOp(fn, args); operatorList.addOp(fn, args);
return Promise.resolve(); return Promise.resolve();
}, },
getOperatorList: function getOperatorList(_ref3) { getOperatorList: function getOperatorList(_ref5) {
var _this8 = this; var _this8 = this;
var stream = _ref3.stream, var stream = _ref5.stream,
task = _ref3.task, task = _ref5.task,
resources = _ref3.resources, resources = _ref5.resources,
operatorList = _ref3.operatorList, operatorList = _ref5.operatorList,
_ref3$initialState = _ref3.initialState, _ref5$initialState = _ref5.initialState,
initialState = _ref3$initialState === undefined ? null : _ref3$initialState; initialState = _ref5$initialState === undefined ? null : _ref5$initialState;
resources = resources || _primitives.Dict.empty; resources = resources || _primitives.Dict.empty;
initialState = initialState || new EvalState(); initialState = initialState || new EvalState();
@ -33520,7 +33572,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
}, rejectXObject); }, rejectXObject);
return; return;
} else if (type.name === 'Image') { } else if (type.name === 'Image') {
self.buildPaintImageXObject(resources, xobj, false, operatorList, name, imageCache); self.buildPaintImageXObject({
resources: resources,
image: xobj,
operatorList: operatorList,
cacheKey: name,
imageCache: imageCache
}).then(resolveXObject, rejectXObject);
return;
} else if (type.name === 'PS') { } else if (type.name === 'PS') {
(0, _util.info)('Ignored XObject subtype PS'); (0, _util.info)('Ignored XObject subtype PS');
} else { } else {
@ -33553,9 +33612,15 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
continue; continue;
} }
} }
self.buildPaintImageXObject(resources, args[0], true, operatorList, cacheKey, imageCache); next(self.buildPaintImageXObject({
args = null; resources: resources,
continue; image: args[0],
isInline: true,
operatorList: operatorList,
cacheKey: cacheKey,
imageCache: imageCache
}));
return;
case _util.OPS.showText: case _util.OPS.showText:
args[0] = self.handleText(args[0], stateManager.state); args[0] = self.handleText(args[0], stateManager.state);
break; break;
@ -33725,21 +33790,21 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
throw reason; throw reason;
}); });
}, },
getTextContent: function getTextContent(_ref4) { getTextContent: function getTextContent(_ref6) {
var _this9 = this; var _this9 = this;
var stream = _ref4.stream, var stream = _ref6.stream,
task = _ref4.task, task = _ref6.task,
resources = _ref4.resources, resources = _ref6.resources,
_ref4$stateManager = _ref4.stateManager, _ref6$stateManager = _ref6.stateManager,
stateManager = _ref4$stateManager === undefined ? null : _ref4$stateManager, stateManager = _ref6$stateManager === undefined ? null : _ref6$stateManager,
_ref4$normalizeWhites = _ref4.normalizeWhitespace, _ref6$normalizeWhites = _ref6.normalizeWhitespace,
normalizeWhitespace = _ref4$normalizeWhites === undefined ? false : _ref4$normalizeWhites, normalizeWhitespace = _ref6$normalizeWhites === undefined ? false : _ref6$normalizeWhites,
_ref4$combineTextItem = _ref4.combineTextItems, _ref6$combineTextItem = _ref6.combineTextItems,
combineTextItems = _ref4$combineTextItem === undefined ? false : _ref4$combineTextItem, combineTextItems = _ref6$combineTextItem === undefined ? false : _ref6$combineTextItem,
sink = _ref4.sink, sink = _ref6.sink,
_ref4$seenStyles = _ref4.seenStyles, _ref6$seenStyles = _ref6.seenStyles,
seenStyles = _ref4$seenStyles === undefined ? Object.create(null) : _ref4$seenStyles; seenStyles = _ref6$seenStyles === undefined ? Object.create(null) : _ref6$seenStyles;
resources = resources || _primitives.Dict.empty; resources = resources || _primitives.Dict.empty;
stateManager = stateManager || new StateManager(new TextState()); stateManager = stateManager || new StateManager(new TextState());
@ -44386,7 +44451,10 @@ var _jpx = __w_pdfjs_require__(67);
var PDFImage = function PDFImageClosure() { var PDFImage = function PDFImageClosure() {
function handleImageData(image, nativeDecoder) { function handleImageData(image, nativeDecoder) {
if (nativeDecoder && nativeDecoder.canDecode(image)) { if (nativeDecoder && nativeDecoder.canDecode(image)) {
return nativeDecoder.decode(image); return nativeDecoder.decode(image).catch(function (reason) {
(0, _util.warn)('Native image decoding failed -- trying to recover: ' + (reason && reason.message));
return image;
});
} }
return Promise.resolve(image); return Promise.resolve(image);
} }

2
build/pdf.worker.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
build/pdf.worker.min.js vendored
View File

File diff suppressed because one or more lines are too long

157
lib/core/evaluator.js
Unescape View File

@ -95,10 +95,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var dict = image.dict; var dict = image.dict;
var colorSpace = dict.get('ColorSpace', 'CS'); var colorSpace = dict.get('ColorSpace', 'CS');
colorSpace = _colorspace.ColorSpace.parse(colorSpace, this.xref, this.resources, this.pdfFunctionFactory); colorSpace = _colorspace.ColorSpace.parse(colorSpace, this.xref, this.resources, this.pdfFunctionFactory);
var numComps = colorSpace.numComps; return this.handler.sendWithPromise('JpegDecode', [image.getIR(this.forceDataSchema), colorSpace.numComps]).then(function (_ref2) {
var decodePromise = this.handler.sendWithPromise('JpegDecode', [image.getIR(this.forceDataSchema), numComps]); var data = _ref2.data,
return decodePromise.then(function (message) { width = _ref2.width,
var data = message.data; height = _ref2.height;
return new _stream.Stream(data, 0, data.length, image.dict); return new _stream.Stream(data, 0, data.length, image.dict);
}); });
} }
@ -119,19 +120,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var cs = _colorspace.ColorSpace.parse(dict.get('ColorSpace', 'CS'), xref, res, pdfFunctionFactory); var cs = _colorspace.ColorSpace.parse(dict.get('ColorSpace', 'CS'), xref, res, pdfFunctionFactory);
return (cs.numComps === 1 || cs.numComps === 3) && cs.isDefaultDecode(dict.getArray('Decode', 'D')); return (cs.numComps === 1 || cs.numComps === 3) && cs.isDefaultDecode(dict.getArray('Decode', 'D'));
}; };
function PartialEvaluator(_ref2) { function PartialEvaluator(_ref3) {
var _this = this; var _this = this;
var pdfManager = _ref2.pdfManager, var pdfManager = _ref3.pdfManager,
xref = _ref2.xref, xref = _ref3.xref,
handler = _ref2.handler, handler = _ref3.handler,
pageIndex = _ref2.pageIndex, pageIndex = _ref3.pageIndex,
idFactory = _ref2.idFactory, idFactory = _ref3.idFactory,
fontCache = _ref2.fontCache, fontCache = _ref3.fontCache,
builtInCMapCache = _ref2.builtInCMapCache, builtInCMapCache = _ref3.builtInCMapCache,
_ref2$options = _ref2.options, _ref3$options = _ref3.options,
options = _ref2$options === undefined ? null : _ref2$options, options = _ref3$options === undefined ? null : _ref3$options,
pdfFunctionFactory = _ref2.pdfFunctionFactory; pdfFunctionFactory = _ref3.pdfFunctionFactory;
this.pdfManager = pdfManager; this.pdfManager = pdfManager;
this.xref = xref; this.xref = xref;
@ -328,20 +329,30 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
} }
}); });
}, },
buildPaintImageXObject: function PartialEvaluator_buildPaintImageXObject(resources, image, inline, operatorList, cacheKey, imageCache) { buildPaintImageXObject: function buildPaintImageXObject(_ref4) {
var _this2 = this; var _this2 = this;
var resources = _ref4.resources,
image = _ref4.image,
_ref4$isInline = _ref4.isInline,
isInline = _ref4$isInline === undefined ? false : _ref4$isInline,
operatorList = _ref4.operatorList,
cacheKey = _ref4.cacheKey,
imageCache = _ref4.imageCache,
_ref4$forceDisableNat = _ref4.forceDisableNativeImageDecoder,
forceDisableNativeImageDecoder = _ref4$forceDisableNat === undefined ? false : _ref4$forceDisableNat;
var dict = image.dict; var dict = image.dict;
var w = dict.get('Width', 'W'); var w = dict.get('Width', 'W');
var h = dict.get('Height', 'H'); var h = dict.get('Height', 'H');
if (!(w && (0, _util.isNum)(w)) || !(h && (0, _util.isNum)(h))) { if (!(w && (0, _util.isNum)(w)) || !(h && (0, _util.isNum)(h))) {
(0, _util.warn)('Image dimensions are missing, or not numbers.'); (0, _util.warn)('Image dimensions are missing, or not numbers.');
return; return Promise.resolve();
} }
var maxImageSize = this.options.maxImageSize; var maxImageSize = this.options.maxImageSize;
if (maxImageSize !== -1 && w * h > maxImageSize) { if (maxImageSize !== -1 && w * h > maxImageSize) {
(0, _util.warn)('Image exceeded maximum allowed size and was removed.'); (0, _util.warn)('Image exceeded maximum allowed size and was removed.');
return; return Promise.resolve();
} }
var imageMask = dict.get('ImageMask', 'IM') || false; var imageMask = dict.get('ImageMask', 'IM') || false;
var imgData, args; var imgData, args;
@ -367,37 +378,48 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
args: args args: args
}; };
} }
return; return Promise.resolve();
} }
var softMask = dict.get('SMask', 'SM') || false; var softMask = dict.get('SMask', 'SM') || false;
var mask = dict.get('Mask') || false; var mask = dict.get('Mask') || false;
var SMALL_IMAGE_DIMENSIONS = 200; var SMALL_IMAGE_DIMENSIONS = 200;
if (inline && !softMask && !mask && !(image instanceof _jpeg_stream.JpegStream) && w + h < SMALL_IMAGE_DIMENSIONS) { if (isInline && !softMask && !mask && !(image instanceof _jpeg_stream.JpegStream) && w + h < SMALL_IMAGE_DIMENSIONS) {
var imageObj = new _image.PDFImage({ var imageObj = new _image.PDFImage({
xref: this.xref, xref: this.xref,
res: resources, res: resources,
image: image, image: image,
isInline: inline, isInline: isInline,
pdfFunctionFactory: this.pdfFunctionFactory pdfFunctionFactory: this.pdfFunctionFactory
}); });
imgData = imageObj.createImageData(true); imgData = imageObj.createImageData(true);
operatorList.addOp(_util.OPS.paintInlineImageXObject, [imgData]); operatorList.addOp(_util.OPS.paintInlineImageXObject, [imgData]);
return; return Promise.resolve();
} }
var nativeImageDecoderSupport = this.options.nativeImageDecoderSupport; var nativeImageDecoderSupport = forceDisableNativeImageDecoder ? _util.NativeImageDecoding.NONE : this.options.nativeImageDecoderSupport;
var objId = 'img_' + this.idFactory.createObjId(); var objId = 'img_' + this.idFactory.createObjId();
operatorList.addDependency(objId);
args = [objId, w, h];
if (nativeImageDecoderSupport !== _util.NativeImageDecoding.NONE && !softMask && !mask && image instanceof _jpeg_stream.JpegStream && NativeImageDecoder.isSupported(image, this.xref, resources, this.pdfFunctionFactory)) { if (nativeImageDecoderSupport !== _util.NativeImageDecoding.NONE && !softMask && !mask && image instanceof _jpeg_stream.JpegStream && NativeImageDecoder.isSupported(image, this.xref, resources, this.pdfFunctionFactory)) {
operatorList.addOp(_util.OPS.paintJpegXObject, args); return this.handler.sendWithPromise('obj', [objId, this.pageIndex, 'JpegStream', image.getIR(this.options.forceDataSchema)]).then(function () {
this.handler.send('obj', [objId, this.pageIndex, 'JpegStream', image.getIR(this.options.forceDataSchema)]); operatorList.addDependency(objId);
if (cacheKey) { args = [objId, w, h];
imageCache[cacheKey] = { operatorList.addOp(_util.OPS.paintJpegXObject, args);
fn: _util.OPS.paintJpegXObject, if (cacheKey) {
args: args imageCache[cacheKey] = {
}; fn: _util.OPS.paintJpegXObject,
} args: args
return; };
}
}, function (reason) {
(0, _util.warn)('Native JPEG decoding failed -- trying to recover: ' + (reason && reason.message));
return _this2.buildPaintImageXObject({
resources: resources,
image: image,
isInline: isInline,
operatorList: operatorList,
cacheKey: cacheKey,
imageCache: imageCache,
forceDisableNativeImageDecoder: true
});
});
} }
var nativeImageDecoder = null; var nativeImageDecoder = null;
if (nativeImageDecoderSupport === _util.NativeImageDecoding.DECODE && (image instanceof _jpeg_stream.JpegStream || mask instanceof _jpeg_stream.JpegStream || softMask instanceof _jpeg_stream.JpegStream)) { if (nativeImageDecoderSupport === _util.NativeImageDecoding.DECODE && (image instanceof _jpeg_stream.JpegStream || mask instanceof _jpeg_stream.JpegStream || softMask instanceof _jpeg_stream.JpegStream)) {
@ -409,12 +431,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
pdfFunctionFactory: this.pdfFunctionFactory pdfFunctionFactory: this.pdfFunctionFactory
}); });
} }
operatorList.addDependency(objId);
args = [objId, w, h];
_image.PDFImage.buildImage({ _image.PDFImage.buildImage({
handler: this.handler, handler: this.handler,
xref: this.xref, xref: this.xref,
res: resources, res: resources,
image: image, image: image,
isInline: inline, isInline: isInline,
nativeDecoder: nativeImageDecoder, nativeDecoder: nativeImageDecoder,
pdfFunctionFactory: this.pdfFunctionFactory pdfFunctionFactory: this.pdfFunctionFactory
}).then(function (imageObj) { }).then(function (imageObj) {
@ -431,7 +455,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
args: args args: args
}; };
} }
return Promise.resolve();
}, },
handleSMask: function PartialEvaluator_handleSmask(smask, resources, operatorList, task, stateManager) { handleSMask: function PartialEvaluator_handleSmask(smask, resources, operatorList, task, stateManager) {
var smaskContent = smask.get('G'); var smaskContent = smask.get('G');
var smaskOptions = { var smaskOptions = {
@ -744,15 +770,15 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
operatorList.addOp(fn, args); operatorList.addOp(fn, args);
return Promise.resolve(); return Promise.resolve();
}, },
getOperatorList: function getOperatorList(_ref3) { getOperatorList: function getOperatorList(_ref5) {
var _this8 = this; var _this8 = this;
var stream = _ref3.stream, var stream = _ref5.stream,
task = _ref3.task, task = _ref5.task,
resources = _ref3.resources, resources = _ref5.resources,
operatorList = _ref3.operatorList, operatorList = _ref5.operatorList,
_ref3$initialState = _ref3.initialState, _ref5$initialState = _ref5.initialState,
initialState = _ref3$initialState === undefined ? null : _ref3$initialState; initialState = _ref5$initialState === undefined ? null : _ref5$initialState;
resources = resources || _primitives.Dict.empty; resources = resources || _primitives.Dict.empty;
initialState = initialState || new EvalState(); initialState = initialState || new EvalState();
@ -829,7 +855,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
}, rejectXObject); }, rejectXObject);
return; return;
} else if (type.name === 'Image') { } else if (type.name === 'Image') {
self.buildPaintImageXObject(resources, xobj, false, operatorList, name, imageCache); self.buildPaintImageXObject({
resources: resources,
image: xobj,
operatorList: operatorList,
cacheKey: name,
imageCache: imageCache
}).then(resolveXObject, rejectXObject);
return;
} else if (type.name === 'PS') { } else if (type.name === 'PS') {
(0, _util.info)('Ignored XObject subtype PS'); (0, _util.info)('Ignored XObject subtype PS');
} else { } else {
@ -862,9 +895,15 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
continue; continue;
} }
} }
self.buildPaintImageXObject(resources, args[0], true, operatorList, cacheKey, imageCache); next(self.buildPaintImageXObject({
args = null; resources: resources,
continue; image: args[0],
isInline: true,
operatorList: operatorList,
cacheKey: cacheKey,
imageCache: imageCache
}));
return;
case _util.OPS.showText: case _util.OPS.showText:
args[0] = self.handleText(args[0], stateManager.state); args[0] = self.handleText(args[0], stateManager.state);
break; break;
@ -1034,21 +1073,21 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
throw reason; throw reason;
}); });
}, },
getTextContent: function getTextContent(_ref4) { getTextContent: function getTextContent(_ref6) {
var _this9 = this; var _this9 = this;
var stream = _ref4.stream, var stream = _ref6.stream,
task = _ref4.task, task = _ref6.task,
resources = _ref4.resources, resources = _ref6.resources,
_ref4$stateManager = _ref4.stateManager, _ref6$stateManager = _ref6.stateManager,
stateManager = _ref4$stateManager === undefined ? null : _ref4$stateManager, stateManager = _ref6$stateManager === undefined ? null : _ref6$stateManager,
_ref4$normalizeWhites = _ref4.normalizeWhitespace, _ref6$normalizeWhites = _ref6.normalizeWhitespace,
normalizeWhitespace = _ref4$normalizeWhites === undefined ? false : _ref4$normalizeWhites, normalizeWhitespace = _ref6$normalizeWhites === undefined ? false : _ref6$normalizeWhites,
_ref4$combineTextItem = _ref4.combineTextItems, _ref6$combineTextItem = _ref6.combineTextItems,
combineTextItems = _ref4$combineTextItem === undefined ? false : _ref4$combineTextItem, combineTextItems = _ref6$combineTextItem === undefined ? false : _ref6$combineTextItem,
sink = _ref4.sink, sink = _ref6.sink,
_ref4$seenStyles = _ref4.seenStyles, _ref6$seenStyles = _ref6.seenStyles,
seenStyles = _ref4$seenStyles === undefined ? Object.create(null) : _ref4$seenStyles; seenStyles = _ref6$seenStyles === undefined ? Object.create(null) : _ref6$seenStyles;
resources = resources || _primitives.Dict.empty; resources = resources || _primitives.Dict.empty;
stateManager = stateManager || new StateManager(new TextState()); stateManager = stateManager || new StateManager(new TextState());

5
lib/core/image.js
Unescape View File

@ -43,7 +43,10 @@ var _jpx = require('./jpx');
var PDFImage = function PDFImageClosure() { var PDFImage = function PDFImageClosure() {
function handleImageData(image, nativeDecoder) { function handleImageData(image, nativeDecoder) {
if (nativeDecoder && nativeDecoder.canDecode(image)) { if (nativeDecoder && nativeDecoder.canDecode(image)) {
return nativeDecoder.decode(image); return nativeDecoder.decode(image).catch(function (reason) {
(0, _util.warn)('Native image decoding failed -- trying to recover: ' + (reason && reason.message));
return image;
});
} }
return Promise.resolve(image); return Promise.resolve(image);
} }

44
lib/core/jpg.js
Unescape View File

@ -39,6 +39,16 @@ var JpegError = function JpegErrorClosure() {
JpegError.constructor = JpegError; JpegError.constructor = JpegError;
return JpegError; return JpegError;
}(); }();
var DNLMarkerError = function DNLMarkerErrorClosure() {
function DNLMarkerError(message, scanLines) {
this.message = message;
this.scanLines = scanLines;
}
DNLMarkerError.prototype = new Error();
DNLMarkerError.prototype.name = 'DNLMarkerError';
DNLMarkerError.constructor = DNLMarkerError;
return DNLMarkerError;
}();
var JpegImage = function JpegImageClosure() { var JpegImage = function JpegImageClosure() {
var dctZigZag = new Uint8Array([0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63]); var dctZigZag = new Uint8Array([0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63]);
var dctCos1 = 4017; var dctCos1 = 4017;
@ -102,6 +112,8 @@ var JpegImage = function JpegImageClosure() {
return 64 * ((component.blocksPerLine + 1) * row + col); return 64 * ((component.blocksPerLine + 1) * row + col);
} }
function decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successivePrev, successive) { function decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successivePrev, successive) {
var parseDNLMarker = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
var mcusPerLine = frame.mcusPerLine; var mcusPerLine = frame.mcusPerLine;
var progressive = frame.progressive; var progressive = frame.progressive;
var startOffset = offset, var startOffset = offset,
@ -116,6 +128,13 @@ var JpegImage = function JpegImageClosure() {
if (bitsData === 0xFF) { if (bitsData === 0xFF) {
var nextByte = data[offset++]; var nextByte = data[offset++];
if (nextByte) { if (nextByte) {
if (nextByte === 0xDC && parseDNLMarker) {
offset += 2;
var scanLines = data[offset++] << 8 | data[offset++];
if (scanLines > 0 && scanLines !== frame.scanLines) {
throw new DNLMarkerError('Found DNL marker (0xFFDC) while parsing scan data', scanLines);
}
}
throw new JpegError('unexpected marker ' + (bitsData << 8 | nextByte).toString(16)); throw new JpegError('unexpected marker ' + (bitsData << 8 | nextByte).toString(16));
} }
} }
@ -554,6 +573,10 @@ var JpegImage = function JpegImageClosure() {
} }
JpegImage.prototype = { JpegImage.prototype = {
parse: function parse(data) { parse: function parse(data) {
var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
_ref$dnlScanLines = _ref.dnlScanLines,
dnlScanLines = _ref$dnlScanLines === undefined ? null : _ref$dnlScanLines;
function readUint16() { function readUint16() {
var value = data[offset] << 8 | data[offset + 1]; var value = data[offset] << 8 | data[offset + 1];
offset += 2; offset += 2;
@ -592,6 +615,7 @@ var JpegImage = function JpegImageClosure() {
var jfif = null; var jfif = null;
var adobe = null; var adobe = null;
var frame, resetInterval; var frame, resetInterval;
var numSOSMarkers = 0;
var quantizationTables = []; var quantizationTables = [];
var huffmanTablesAC = [], var huffmanTablesAC = [],
huffmanTablesDC = []; huffmanTablesDC = [];
@ -682,7 +706,8 @@ var JpegImage = function JpegImageClosure() {
frame.extended = fileMarker === 0xFFC1; frame.extended = fileMarker === 0xFFC1;
frame.progressive = fileMarker === 0xFFC2; frame.progressive = fileMarker === 0xFFC2;
frame.precision = data[offset++]; frame.precision = data[offset++];
frame.scanLines = readUint16(); var sofScanLines = readUint16();
frame.scanLines = dnlScanLines || sofScanLines;
frame.samplesPerLine = readUint16(); frame.samplesPerLine = readUint16();
frame.components = []; frame.components = [];
frame.componentIds = {}; frame.componentIds = {};
@ -736,6 +761,7 @@ var JpegImage = function JpegImageClosure() {
resetInterval = readUint16(); resetInterval = readUint16();
break; break;
case 0xFFDA: case 0xFFDA:
var parseDNLMarker = ++numSOSMarkers === 1 && !dnlScanLines;
readUint16(); readUint16();
var selectorsCount = data[offset++]; var selectorsCount = data[offset++];
var components = [], var components = [],
@ -751,8 +777,19 @@ var JpegImage = function JpegImageClosure() {
var spectralStart = data[offset++]; var spectralStart = data[offset++];
var spectralEnd = data[offset++]; var spectralEnd = data[offset++];
var successiveApproximation = data[offset++]; var successiveApproximation = data[offset++];
var processed = decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successiveApproximation >> 4, successiveApproximation & 15); try {
offset += processed; var processed = decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successiveApproximation >> 4, successiveApproximation & 15, parseDNLMarker);
offset += processed;
} catch (ex) {
if (ex instanceof DNLMarkerError) {
(0, _util.warn)('Attempting to re-parse JPEG image using "scanLines" ' + 'parameter found in DNL marker (0xFFDC) segment.');
return this.parse(data, { dnlScanLines: ex.scanLines });
}
throw ex;
}
break;
case 0xFFDC:
offset += 4;
break; break;
case 0xFFFF: case 0xFFFF:
if (data[offset] !== 0xFF) { if (data[offset] !== 0xFF) {
@ -795,6 +832,7 @@ var JpegImage = function JpegImageClosure() {
} }
this.numComponents = this.components.length; this.numComponents = this.components.length;
}, },
_getLinearizedBlockData: function getLinearizedBlockData(width, height) { _getLinearizedBlockData: function getLinearizedBlockData(width, height) {
var scaleX = this.width / width, var scaleX = this.width / width,
scaleY = this.height / height; scaleY = this.height / height;

2
lib/core/worker.js
Unescape View File

@ -223,7 +223,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null; var cancelXHRs = null;
var WorkerTasks = []; var WorkerTasks = [];
var apiVersion = docParams.apiVersion; var apiVersion = docParams.apiVersion;
var workerVersion = '2.0.338'; var workerVersion = '2.0.345';
if (apiVersion !== null && apiVersion !== workerVersion) { if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".')); throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
} }

20
lib/display/api.js
Unescape View File

@ -178,7 +178,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
if (worker.destroyed) { if (worker.destroyed) {
return Promise.reject(new Error('Worker was destroyed')); return Promise.reject(new Error('Worker was destroyed'));
} }
var apiVersion = '2.0.338'; var apiVersion = '2.0.345';
source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange'); source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch'); source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream'); source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
@ -1177,8 +1177,18 @@ var WorkerTransport = function WorkerTransportClosure() {
switch (type) { switch (type) {
case 'JpegStream': case 'JpegStream':
imageData = data[3]; imageData = data[3];
(0, _util.loadJpegStream)(id, imageData, pageProxy.objs); return new Promise(function (resolve, reject) {
break; var img = new Image();
img.onload = function () {
resolve(img);
};
img.onerror = function () {
reject(new Error('Error during JPEG image loading'));
};
img.src = imageData;
}).then(function (img) {
pageProxy.objs.resolve(id, img);
});
case 'Image': case 'Image':
imageData = data[3]; imageData = data[3];
pageProxy.objs.resolve(id, imageData); pageProxy.objs.resolve(id, imageData);
@ -1567,8 +1577,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}(); }();
var version, build; var version, build;
{ {
exports.version = version = '2.0.338'; exports.version = version = '2.0.345';
exports.build = build = '25293628'; exports.build = build = '7bb06649';
} }
exports.getDocument = getDocument; exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort; exports.LoopbackPort = LoopbackPort;

4
lib/display/global.js
Unescape View File

@ -51,8 +51,8 @@ if (!_global_scope2.default.PDFJS) {
} }
var PDFJS = _global_scope2.default.PDFJS; var PDFJS = _global_scope2.default.PDFJS;
{ {
PDFJS.version = '2.0.338'; PDFJS.version = '2.0.345';
PDFJS.build = '25293628'; PDFJS.build = '7bb06649';
} }
PDFJS.pdfBug = false; PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) { if (PDFJS.verbosity !== undefined) {

4
lib/pdf.js
Unescape View File

@ -21,8 +21,8 @@
*/ */
'use strict'; 'use strict';
var pdfjsVersion = '2.0.338'; var pdfjsVersion = '2.0.345';
var pdfjsBuild = '25293628'; var pdfjsBuild = '7bb06649';
var pdfjsSharedUtil = require('./shared/util.js'); var pdfjsSharedUtil = require('./shared/util.js');
var pdfjsDisplayGlobal = require('./display/global.js'); var pdfjsDisplayGlobal = require('./display/global.js');
var pdfjsDisplayAPI = require('./display/api.js'); var pdfjsDisplayAPI = require('./display/api.js');

4
lib/pdf.worker.js vendored
Unescape View File

@ -21,7 +21,7 @@
*/ */
'use strict'; 'use strict';
var pdfjsVersion = '2.0.338'; var pdfjsVersion = '2.0.345';
var pdfjsBuild = '25293628'; var pdfjsBuild = '7bb06649';
var pdfjsCoreWorker = require('./core/worker.js'); var pdfjsCoreWorker = require('./core/worker.js');
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler; exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;

14
lib/shared/util.js
Unescape View File

@ -24,7 +24,7 @@
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
value: true value: true
}); });
exports.unreachable = exports.warn = exports.utf8StringToString = exports.stringToUTF8String = exports.stringToPDFString = exports.stringToBytes = exports.string32 = exports.shadow = exports.setVerbosityLevel = exports.ReadableStream = exports.removeNullCharacters = exports.readUint32 = exports.readUint16 = exports.readInt8 = exports.log2 = exports.loadJpegStream = exports.isEvalSupported = exports.isLittleEndian = exports.createValidAbsoluteUrl = exports.isSameOrigin = exports.isSpace = exports.isString = exports.isNum = exports.isEmptyObj = exports.isBool = exports.isArrayBuffer = exports.info = exports.getVerbosityLevel = exports.getLookupTableFactory = exports.deprecated = exports.createObjectURL = exports.createPromiseCapability = exports.createBlob = exports.bytesToString = exports.assert = exports.arraysToBytes = exports.arrayByteLength = exports.FormatError = exports.XRefParseException = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PasswordResponses = exports.PasswordException = exports.PageViewport = exports.NotImplementedException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.MessageHandler = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VERBOSITY_LEVELS = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = undefined; exports.unreachable = exports.warn = exports.utf8StringToString = exports.stringToUTF8String = exports.stringToPDFString = exports.stringToBytes = exports.string32 = exports.shadow = exports.setVerbosityLevel = exports.ReadableStream = exports.removeNullCharacters = exports.readUint32 = exports.readUint16 = exports.readInt8 = exports.log2 = exports.isEvalSupported = exports.isLittleEndian = exports.createValidAbsoluteUrl = exports.isSameOrigin = exports.isSpace = exports.isString = exports.isNum = exports.isEmptyObj = exports.isBool = exports.isArrayBuffer = exports.info = exports.getVerbosityLevel = exports.getLookupTableFactory = exports.deprecated = exports.createObjectURL = exports.createPromiseCapability = exports.createBlob = exports.bytesToString = exports.assert = exports.arraysToBytes = exports.arrayByteLength = exports.FormatError = exports.XRefParseException = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PasswordResponses = exports.PasswordException = exports.PageViewport = exports.NotImplementedException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.MessageHandler = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VERBOSITY_LEVELS = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = undefined;
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@ -1257,17 +1257,6 @@ MessageHandler.prototype = {
this.comObj.removeEventListener('message', this._onComObjOnMessage); this.comObj.removeEventListener('message', this._onComObjOnMessage);
} }
}; };
function loadJpegStream(id, imageUrl, objs) {
var img = new Image();
img.onload = function loadJpegStream_onloadClosure() {
objs.resolve(id, img);
};
img.onerror = function loadJpegStream_onerrorClosure() {
objs.resolve(id, null);
warn('Error during JPEG image loading');
};
img.src = imageUrl;
}
exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX; exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
exports.IDENTITY_MATRIX = IDENTITY_MATRIX; exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
exports.OPS = OPS; exports.OPS = OPS;
@ -1318,7 +1307,6 @@ exports.isSameOrigin = isSameOrigin;
exports.createValidAbsoluteUrl = createValidAbsoluteUrl; exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
exports.isLittleEndian = isLittleEndian; exports.isLittleEndian = isLittleEndian;
exports.isEvalSupported = isEvalSupported; exports.isEvalSupported = isEvalSupported;
exports.loadJpegStream = loadJpegStream;
exports.log2 = log2; exports.log2 = log2;
exports.readInt8 = readInt8; exports.readInt8 = readInt8;
exports.readUint16 = readUint16; exports.readUint16 = readUint16;

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "pdfjs-dist", "name": "pdfjs-dist",
"version": "2.0.338", "version": "2.0.345",
"main": "build/pdf.js", "main": "build/pdf.js",
"description": "Generic build of Mozilla's PDF.js library.", "description": "Generic build of Mozilla's PDF.js library.",
"keywords": [ "keywords": [

Write Preview
Loading…
Cancel
Save