Browse Source

PDF.js version 2.0.312 - See mozilla/pdf.js@695a909a938695d95f7400eda2fae76409014b30

master v2.0.312
pdfjsbot 7 years ago
parent
commit
cc0776a8ff
  1. 2
      bower.json
  2. 14
      build/pdf.js
  3. 2
      build/pdf.js.map
  4. 2
      build/pdf.min.js
  5. 22
      build/pdf.worker.js
  6. 2
      build/pdf.worker.js.map
  7. 2
      build/pdf.worker.min.js
  8. 16
      lib/core/jpg.js
  9. 2
      lib/core/worker.js
  10. 6
      lib/display/api.js
  11. 4
      lib/display/global.js
  12. 4
      lib/pdf.js
  13. 4
      lib/pdf.worker.js
  14. 2
      package.json

2
bower.json

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

14
build/pdf.js

@ -3311,7 +3311,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.310'; var apiVersion = '2.0.312';
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');
@ -4700,8 +4700,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}(); }();
var version, build; var version, build;
{ {
exports.version = version = '2.0.310'; exports.version = version = '2.0.312';
exports.build = build = '29d77ded'; exports.build = build = '695a909a';
} }
exports.getDocument = getDocument; exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort; exports.LoopbackPort = LoopbackPort;
@ -7459,8 +7459,8 @@ exports.SVGGraphics = SVGGraphics;
"use strict"; "use strict";
var pdfjsVersion = '2.0.310'; var pdfjsVersion = '2.0.312';
var pdfjsBuild = '29d77ded'; var pdfjsBuild = '695a909a';
var pdfjsSharedUtil = __w_pdfjs_require__(0); var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(115); var pdfjsDisplayGlobal = __w_pdfjs_require__(115);
var pdfjsDisplayAPI = __w_pdfjs_require__(58); var pdfjsDisplayAPI = __w_pdfjs_require__(58);
@ -12663,8 +12663,8 @@ if (!_global_scope2.default.PDFJS) {
} }
var PDFJS = _global_scope2.default.PDFJS; var PDFJS = _global_scope2.default.PDFJS;
{ {
PDFJS.version = '2.0.310'; PDFJS.version = '2.0.312';
PDFJS.build = '29d77ded'; PDFJS.build = '695a909a';
} }
PDFJS.pdfBug = false; PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) { if (PDFJS.verbosity !== undefined) {

2
build/pdf.js.map

File diff suppressed because one or more lines are too long

2
build/pdf.min.js vendored

File diff suppressed because one or more lines are too long

22
build/pdf.worker.js vendored

@ -22498,8 +22498,8 @@ exports.PostScriptCompiler = PostScriptCompiler;
"use strict"; "use strict";
var pdfjsVersion = '2.0.310'; var pdfjsVersion = '2.0.312';
var pdfjsBuild = '29d77ded'; var pdfjsBuild = '695a909a';
var pdfjsCoreWorker = __w_pdfjs_require__(74); var pdfjsCoreWorker = __w_pdfjs_require__(74);
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler; exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
@ -22712,7 +22712,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.310'; var workerVersion = '2.0.312';
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 + '".'));
} }
@ -31208,7 +31208,7 @@ var JpegImage = function JpegImageClosure() {
bitsCount = 0; bitsCount = 0;
fileMarker = findNextFileMarker(data, offset); fileMarker = findNextFileMarker(data, offset);
if (fileMarker && fileMarker.invalid) { if (fileMarker && fileMarker.invalid) {
(0, _util.warn)('decodeScan - unexpected MCU data, next marker is: ' + fileMarker.invalid); (0, _util.warn)('decodeScan - unexpected MCU data, current marker is: ' + fileMarker.invalid);
offset = fileMarker.offset; offset = fileMarker.offset;
} }
var marker = fileMarker && fileMarker.marker; var marker = fileMarker && fileMarker.marker;
@ -31223,7 +31223,7 @@ var JpegImage = function JpegImageClosure() {
} }
fileMarker = findNextFileMarker(data, offset); fileMarker = findNextFileMarker(data, offset);
if (fileMarker && fileMarker.invalid) { if (fileMarker && fileMarker.invalid) {
(0, _util.warn)('decodeScan - unexpected Scan data, next marker is: ' + fileMarker.invalid); (0, _util.warn)('decodeScan - unexpected Scan data, current marker is: ' + fileMarker.invalid);
offset = fileMarker.offset; offset = fileMarker.offset;
} }
return offset - startOffset; return offset - startOffset;
@ -31389,7 +31389,9 @@ var JpegImage = function JpegImageClosure() {
} }
return component.blockData; return component.blockData;
} }
function findNextFileMarker(data, currentPos, startPos) { function findNextFileMarker(data, currentPos) {
var startPos = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : currentPos;
function peekUint16(pos) { function peekUint16(pos) {
return data[pos] << 8 | data[pos + 1]; return data[pos] << 8 | data[pos + 1];
} }
@ -31431,7 +31433,7 @@ var JpegImage = function JpegImageClosure() {
var endOffset = offset + length - 2; var endOffset = offset + length - 2;
var fileMarker = findNextFileMarker(data, endOffset, offset); var fileMarker = findNextFileMarker(data, endOffset, offset);
if (fileMarker && fileMarker.invalid) { if (fileMarker && fileMarker.invalid) {
(0, _util.warn)('readDataBlock - incorrect length, next marker is: ' + fileMarker.invalid); (0, _util.warn)('readDataBlock - incorrect length, current marker is: ' + fileMarker.invalid);
endOffset = fileMarker.offset; endOffset = fileMarker.offset;
} }
var array = data.subarray(offset, endOffset); var array = data.subarray(offset, endOffset);
@ -31631,6 +31633,12 @@ var JpegImage = function JpegImageClosure() {
offset -= 3; offset -= 3;
break; break;
} }
var nextFileMarker = findNextFileMarker(data, offset - 2);
if (nextFileMarker && nextFileMarker.invalid) {
(0, _util.warn)('JpegImage.parse - unexpected data, current marker is: ' + nextFileMarker.invalid);
offset = nextFileMarker.offset;
break;
}
throw new JpegError('unknown marker ' + fileMarker.toString(16)); throw new JpegError('unknown marker ' + fileMarker.toString(16));
} }
fileMarker = readUint16(); fileMarker = readUint16();

2
build/pdf.worker.js.map vendored

File diff suppressed because one or more lines are too long

2
build/pdf.worker.min.js vendored

File diff suppressed because one or more lines are too long

16
lib/core/jpg.js

@ -339,7 +339,7 @@ var JpegImage = function JpegImageClosure() {
bitsCount = 0; bitsCount = 0;
fileMarker = findNextFileMarker(data, offset); fileMarker = findNextFileMarker(data, offset);
if (fileMarker && fileMarker.invalid) { if (fileMarker && fileMarker.invalid) {
(0, _util.warn)('decodeScan - unexpected MCU data, next marker is: ' + fileMarker.invalid); (0, _util.warn)('decodeScan - unexpected MCU data, current marker is: ' + fileMarker.invalid);
offset = fileMarker.offset; offset = fileMarker.offset;
} }
var marker = fileMarker && fileMarker.marker; var marker = fileMarker && fileMarker.marker;
@ -354,7 +354,7 @@ var JpegImage = function JpegImageClosure() {
} }
fileMarker = findNextFileMarker(data, offset); fileMarker = findNextFileMarker(data, offset);
if (fileMarker && fileMarker.invalid) { if (fileMarker && fileMarker.invalid) {
(0, _util.warn)('decodeScan - unexpected Scan data, next marker is: ' + fileMarker.invalid); (0, _util.warn)('decodeScan - unexpected Scan data, current marker is: ' + fileMarker.invalid);
offset = fileMarker.offset; offset = fileMarker.offset;
} }
return offset - startOffset; return offset - startOffset;
@ -520,7 +520,9 @@ var JpegImage = function JpegImageClosure() {
} }
return component.blockData; return component.blockData;
} }
function findNextFileMarker(data, currentPos, startPos) { function findNextFileMarker(data, currentPos) {
var startPos = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : currentPos;
function peekUint16(pos) { function peekUint16(pos) {
return data[pos] << 8 | data[pos + 1]; return data[pos] << 8 | data[pos + 1];
} }
@ -562,7 +564,7 @@ var JpegImage = function JpegImageClosure() {
var endOffset = offset + length - 2; var endOffset = offset + length - 2;
var fileMarker = findNextFileMarker(data, endOffset, offset); var fileMarker = findNextFileMarker(data, endOffset, offset);
if (fileMarker && fileMarker.invalid) { if (fileMarker && fileMarker.invalid) {
(0, _util.warn)('readDataBlock - incorrect length, next marker is: ' + fileMarker.invalid); (0, _util.warn)('readDataBlock - incorrect length, current marker is: ' + fileMarker.invalid);
endOffset = fileMarker.offset; endOffset = fileMarker.offset;
} }
var array = data.subarray(offset, endOffset); var array = data.subarray(offset, endOffset);
@ -762,6 +764,12 @@ var JpegImage = function JpegImageClosure() {
offset -= 3; offset -= 3;
break; break;
} }
var nextFileMarker = findNextFileMarker(data, offset - 2);
if (nextFileMarker && nextFileMarker.invalid) {
(0, _util.warn)('JpegImage.parse - unexpected data, current marker is: ' + nextFileMarker.invalid);
offset = nextFileMarker.offset;
break;
}
throw new JpegError('unknown marker ' + fileMarker.toString(16)); throw new JpegError('unknown marker ' + fileMarker.toString(16));
} }
fileMarker = readUint16(); fileMarker = readUint16();

2
lib/core/worker.js

@ -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.310'; var workerVersion = '2.0.312';
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 + '".'));
} }

6
lib/display/api.js

@ -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.310'; var apiVersion = '2.0.312';
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');
@ -1567,8 +1567,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}(); }();
var version, build; var version, build;
{ {
exports.version = version = '2.0.310'; exports.version = version = '2.0.312';
exports.build = build = '29d77ded'; exports.build = build = '695a909a';
} }
exports.getDocument = getDocument; exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort; exports.LoopbackPort = LoopbackPort;

4
lib/display/global.js

@ -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.310'; PDFJS.version = '2.0.312';
PDFJS.build = '29d77ded'; PDFJS.build = '695a909a';
} }
PDFJS.pdfBug = false; PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) { if (PDFJS.verbosity !== undefined) {

4
lib/pdf.js

@ -21,8 +21,8 @@
*/ */
'use strict'; 'use strict';
var pdfjsVersion = '2.0.310'; var pdfjsVersion = '2.0.312';
var pdfjsBuild = '29d77ded'; var pdfjsBuild = '695a909a';
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

@ -21,7 +21,7 @@
*/ */
'use strict'; 'use strict';
var pdfjsVersion = '2.0.310'; var pdfjsVersion = '2.0.312';
var pdfjsBuild = '29d77ded'; var pdfjsBuild = '695a909a';
var pdfjsCoreWorker = require('./core/worker.js'); var pdfjsCoreWorker = require('./core/worker.js');
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler; exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "pdfjs-dist", "name": "pdfjs-dist",
"version": "2.0.310", "version": "2.0.312",
"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": [

Loading…
Cancel
Save