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

PDF.js version 1.7.393 - See mozilla/pdf.js@ede4d3c7c50ef720e59106de7fa0b32f20f6f085

master v1.7.393
pdfjsbot 8 years ago
parent
75759fc128
commit
5b51063840
12 changed files with 181 additions and 100 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. 77
      build/pdf.combined.js
  3. 12
      build/pdf.js
  4. 4
      build/pdf.min.js
  5. 69
      build/pdf.worker.js
  6. 34
      build/pdf.worker.min.js
  7. 65
      lib/core/jpg.js
  8. 4
      lib/display/api.js
  9. 4
      lib/display/global.js
  10. 4
      lib/pdf.js
  11. 4
      lib/pdf.worker.js
  12. 2
      package.json

2
bower.json
Unescape View File

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

77
build/pdf.combined.js
Unescape View File

@ -12716,8 +12716,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
} }
}; };
}(); }();
exports.version = '1.7.391'; exports.version = '1.7.393';
exports.build = 'cd5acf50'; exports.build = 'ede4d3c7';
exports.getDocument = getDocument; exports.getDocument = getDocument;
exports.PDFDataRangeTransport = PDFDataRangeTransport; exports.PDFDataRangeTransport = PDFDataRangeTransport;
exports.PDFWorker = PDFWorker; exports.PDFWorker = PDFWorker;
@ -27891,8 +27891,8 @@ if (!globalScope.PDFJS) {
globalScope.PDFJS = {}; globalScope.PDFJS = {};
} }
var PDFJS = globalScope.PDFJS; var PDFJS = globalScope.PDFJS;
PDFJS.version = '1.7.391'; PDFJS.version = '1.7.393';
PDFJS.build = 'cd5acf50'; PDFJS.build = 'ede4d3c7';
PDFJS.pdfBug = false; PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) { if (PDFJS.verbosity !== undefined) {
sharedUtil.setVerbosityLevel(PDFJS.verbosity); sharedUtil.setVerbosityLevel(PDFJS.verbosity);
@ -35104,7 +35104,7 @@ var JpegImage = function JpegImageClosure() {
decodeFn = decodeBaseline; decodeFn = decodeBaseline;
} }
var mcu = 0, var mcu = 0,
marker; fileMarker;
var mcuExpected; var mcuExpected;
if (componentsLength === 1) { if (componentsLength === 1) {
mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn; mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
@ -35140,12 +35140,13 @@ var JpegImage = function JpegImageClosure() {
} }
} }
bitsCount = 0; bitsCount = 0;
marker = data[offset] << 8 | data[offset + 1]; fileMarker = findNextFileMarker(data, offset);
while (data[offset] === 0x00 && offset < data.length - 1) { if (fileMarker && fileMarker.invalid) {
offset++; warn('decodeScan - unexpected MCU data, next marker is: ' + fileMarker.invalid);
marker = data[offset] << 8 | data[offset + 1]; offset = fileMarker.offset;
} }
if (marker <= 0xFF00) { var marker = fileMarker && fileMarker.marker;
if (!marker || marker <= 0xFF00) {
error('JPEG error: marker was not found'); error('JPEG error: marker was not found');
} }
if (marker >= 0xFFD0 && marker <= 0xFFD7) { if (marker >= 0xFFD0 && marker <= 0xFFD7) {
@ -35154,6 +35155,11 @@ var JpegImage = function JpegImageClosure() {
break; break;
} }
} }
fileMarker = findNextFileMarker(data, offset);
if (fileMarker && fileMarker.invalid) {
warn('decodeScan - unexpected Scan data, next marker is: ' + fileMarker.invalid);
offset = fileMarker.offset;
}
return offset - startOffset; return offset - startOffset;
} }
function quantizeAndInverse(component, blockBufferOffset, p) { function quantizeAndInverse(component, blockBufferOffset, p) {
@ -35320,6 +35326,36 @@ var JpegImage = function JpegImageClosure() {
function clamp0to255(a) { function clamp0to255(a) {
return a <= 0 ? 0 : a >= 255 ? 255 : a; return a <= 0 ? 0 : a >= 255 ? 255 : a;
} }
function findNextFileMarker(data, currentPos, startPos) {
function peekUint16(pos) {
return data[pos] << 8 | data[pos + 1];
}
var maxPos = data.length - 1;
var newPos = startPos < currentPos ? startPos : currentPos;
if (currentPos >= maxPos) {
return null;
}
var currentMarker = peekUint16(currentPos);
if (currentMarker >= 0xFFC0 && currentMarker <= 0xFFFE) {
return {
invalid: null,
marker: currentMarker,
offset: currentPos
};
}
var newMarker = peekUint16(newPos);
while (!(newMarker >= 0xFFC0 && newMarker <= 0xFFFE)) {
if (++newPos >= maxPos) {
return null;
}
newMarker = peekUint16(newPos);
}
return {
invalid: currentMarker.toString(16),
marker: newMarker,
offset: newPos
};
}
JpegImage.prototype = { JpegImage.prototype = {
parse: function parse(data) { parse: function parse(data) {
function readUint16() { function readUint16() {
@ -35328,21 +35364,12 @@ var JpegImage = function JpegImageClosure() {
return value; return value;
} }
function readDataBlock() { function readDataBlock() {
function isValidMarkerAt(pos) {
if (pos < data.length - 1) {
return data[pos] === 0xFF && data[pos + 1] >= 0xC0 && data[pos + 1] <= 0xFE;
}
return true;
}
var length = readUint16(); var length = readUint16();
var endOffset = offset + length - 2; var endOffset = offset + length - 2;
if (!isValidMarkerAt(endOffset)) { var fileMarker = findNextFileMarker(data, endOffset, offset);
warn('readDataBlock - incorrect length, next marker is: ' + (data[endOffset] << 8 | data[endOffset + 1]).toString('16')); if (fileMarker && fileMarker.invalid) {
var pos = offset; warn('readDataBlock - incorrect length, next marker is: ' + fileMarker.invalid);
while (!isValidMarkerAt(pos)) { endOffset = fileMarker.offset;
pos++;
}
endOffset = pos;
} }
var array = data.subarray(offset, endOffset); var array = data.subarray(offset, endOffset);
offset += array.length; offset += array.length;
@ -43403,8 +43430,8 @@ exports.TilingPattern = TilingPattern;
"use strict"; "use strict";
var pdfjsVersion = '1.7.391'; var pdfjsVersion = '1.7.393';
var pdfjsBuild = 'cd5acf50'; var pdfjsBuild = 'ede4d3c7';
var pdfjsSharedUtil = __w_pdfjs_require__(0); var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(26); var pdfjsDisplayGlobal = __w_pdfjs_require__(26);
var pdfjsDisplayAPI = __w_pdfjs_require__(10); var pdfjsDisplayAPI = __w_pdfjs_require__(10);

12
build/pdf.js
Unescape View File

@ -3430,8 +3430,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
} }
}; };
}(); }();
exports.version = '1.7.391'; exports.version = '1.7.393';
exports.build = 'cd5acf50'; exports.build = 'ede4d3c7';
exports.getDocument = getDocument; exports.getDocument = getDocument;
exports.PDFDataRangeTransport = PDFDataRangeTransport; exports.PDFDataRangeTransport = PDFDataRangeTransport;
exports.PDFWorker = PDFWorker; exports.PDFWorker = PDFWorker;
@ -5370,8 +5370,8 @@ if (!globalScope.PDFJS) {
globalScope.PDFJS = {}; globalScope.PDFJS = {};
} }
var PDFJS = globalScope.PDFJS; var PDFJS = globalScope.PDFJS;
PDFJS.version = '1.7.391'; PDFJS.version = '1.7.393';
PDFJS.build = 'cd5acf50'; PDFJS.build = 'ede4d3c7';
PDFJS.pdfBug = false; PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) { if (PDFJS.verbosity !== undefined) {
sharedUtil.setVerbosityLevel(PDFJS.verbosity); sharedUtil.setVerbosityLevel(PDFJS.verbosity);
@ -7881,8 +7881,8 @@ exports.TilingPattern = TilingPattern;
"use strict"; "use strict";
var pdfjsVersion = '1.7.391'; var pdfjsVersion = '1.7.393';
var pdfjsBuild = 'cd5acf50'; var pdfjsBuild = 'ede4d3c7';
var pdfjsSharedUtil = __w_pdfjs_require__(0); var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(9); var pdfjsDisplayGlobal = __w_pdfjs_require__(9);
var pdfjsDisplayAPI = __w_pdfjs_require__(3); var pdfjsDisplayAPI = __w_pdfjs_require__(3);

4
build/pdf.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -31455,7 +31455,7 @@ var JpegImage = function JpegImageClosure() {
decodeFn = decodeBaseline; decodeFn = decodeBaseline;
} }
var mcu = 0, var mcu = 0,
marker; fileMarker;
var mcuExpected; var mcuExpected;
if (componentsLength === 1) { if (componentsLength === 1) {
mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn; mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
@ -31491,12 +31491,13 @@ var JpegImage = function JpegImageClosure() {
} }
} }
bitsCount = 0; bitsCount = 0;
marker = data[offset] << 8 | data[offset + 1]; fileMarker = findNextFileMarker(data, offset);
while (data[offset] === 0x00 && offset < data.length - 1) { if (fileMarker && fileMarker.invalid) {
offset++; warn('decodeScan - unexpected MCU data, next marker is: ' + fileMarker.invalid);
marker = data[offset] << 8 | data[offset + 1]; offset = fileMarker.offset;
} }
if (marker <= 0xFF00) { var marker = fileMarker && fileMarker.marker;
if (!marker || marker <= 0xFF00) {
error('JPEG error: marker was not found'); error('JPEG error: marker was not found');
} }
if (marker >= 0xFFD0 && marker <= 0xFFD7) { if (marker >= 0xFFD0 && marker <= 0xFFD7) {
@ -31505,6 +31506,11 @@ var JpegImage = function JpegImageClosure() {
break; break;
} }
} }
fileMarker = findNextFileMarker(data, offset);
if (fileMarker && fileMarker.invalid) {
warn('decodeScan - unexpected Scan data, next marker is: ' + fileMarker.invalid);
offset = fileMarker.offset;
}
return offset - startOffset; return offset - startOffset;
} }
function quantizeAndInverse(component, blockBufferOffset, p) { function quantizeAndInverse(component, blockBufferOffset, p) {
@ -31671,6 +31677,36 @@ var JpegImage = function JpegImageClosure() {
function clamp0to255(a) { function clamp0to255(a) {
return a <= 0 ? 0 : a >= 255 ? 255 : a; return a <= 0 ? 0 : a >= 255 ? 255 : a;
} }
function findNextFileMarker(data, currentPos, startPos) {
function peekUint16(pos) {
return data[pos] << 8 | data[pos + 1];
}
var maxPos = data.length - 1;
var newPos = startPos < currentPos ? startPos : currentPos;
if (currentPos >= maxPos) {
return null;
}
var currentMarker = peekUint16(currentPos);
if (currentMarker >= 0xFFC0 && currentMarker <= 0xFFFE) {
return {
invalid: null,
marker: currentMarker,
offset: currentPos
};
}
var newMarker = peekUint16(newPos);
while (!(newMarker >= 0xFFC0 && newMarker <= 0xFFFE)) {
if (++newPos >= maxPos) {
return null;
}
newMarker = peekUint16(newPos);
}
return {
invalid: currentMarker.toString(16),
marker: newMarker,
offset: newPos
};
}
JpegImage.prototype = { JpegImage.prototype = {
parse: function parse(data) { parse: function parse(data) {
function readUint16() { function readUint16() {
@ -31679,21 +31715,12 @@ var JpegImage = function JpegImageClosure() {
return value; return value;
} }
function readDataBlock() { function readDataBlock() {
function isValidMarkerAt(pos) {
if (pos < data.length - 1) {
return data[pos] === 0xFF && data[pos + 1] >= 0xC0 && data[pos + 1] <= 0xFE;
}
return true;
}
var length = readUint16(); var length = readUint16();
var endOffset = offset + length - 2; var endOffset = offset + length - 2;
if (!isValidMarkerAt(endOffset)) { var fileMarker = findNextFileMarker(data, endOffset, offset);
warn('readDataBlock - incorrect length, next marker is: ' + (data[endOffset] << 8 | data[endOffset + 1]).toString('16')); if (fileMarker && fileMarker.invalid) {
var pos = offset; warn('readDataBlock - incorrect length, next marker is: ' + fileMarker.invalid);
while (!isValidMarkerAt(pos)) { endOffset = fileMarker.offset;
pos++;
}
endOffset = pos;
} }
var array = data.subarray(offset, endOffset); var array = data.subarray(offset, endOffset);
offset += array.length; offset += array.length;
@ -36863,8 +36890,8 @@ exports.Type1Parser = Type1Parser;
"use strict"; "use strict";
var pdfjsVersion = '1.7.391'; var pdfjsVersion = '1.7.393';
var pdfjsBuild = 'cd5acf50'; var pdfjsBuild = 'ede4d3c7';
var pdfjsCoreWorker = __w_pdfjs_require__(8); var pdfjsCoreWorker = __w_pdfjs_require__(8);
{ {
__w_pdfjs_require__(19); __w_pdfjs_require__(19);

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

File diff suppressed because one or more lines are too long

65
lib/core/jpg.js
Unescape View File

@ -278,7 +278,7 @@ var JpegImage = function JpegImageClosure() {
decodeFn = decodeBaseline; decodeFn = decodeBaseline;
} }
var mcu = 0, var mcu = 0,
marker; fileMarker;
var mcuExpected; var mcuExpected;
if (componentsLength === 1) { if (componentsLength === 1) {
mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn; mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
@ -314,12 +314,13 @@ var JpegImage = function JpegImageClosure() {
} }
} }
bitsCount = 0; bitsCount = 0;
marker = data[offset] << 8 | data[offset + 1]; fileMarker = findNextFileMarker(data, offset);
while (data[offset] === 0x00 && offset < data.length - 1) { if (fileMarker && fileMarker.invalid) {
offset++; warn('decodeScan - unexpected MCU data, next marker is: ' + fileMarker.invalid);
marker = data[offset] << 8 | data[offset + 1]; offset = fileMarker.offset;
} }
if (marker <= 0xFF00) { var marker = fileMarker && fileMarker.marker;
if (!marker || marker <= 0xFF00) {
error('JPEG error: marker was not found'); error('JPEG error: marker was not found');
} }
if (marker >= 0xFFD0 && marker <= 0xFFD7) { if (marker >= 0xFFD0 && marker <= 0xFFD7) {
@ -328,6 +329,11 @@ var JpegImage = function JpegImageClosure() {
break; break;
} }
} }
fileMarker = findNextFileMarker(data, offset);
if (fileMarker && fileMarker.invalid) {
warn('decodeScan - unexpected Scan data, next marker is: ' + fileMarker.invalid);
offset = fileMarker.offset;
}
return offset - startOffset; return offset - startOffset;
} }
function quantizeAndInverse(component, blockBufferOffset, p) { function quantizeAndInverse(component, blockBufferOffset, p) {
@ -494,6 +500,36 @@ var JpegImage = function JpegImageClosure() {
function clamp0to255(a) { function clamp0to255(a) {
return a <= 0 ? 0 : a >= 255 ? 255 : a; return a <= 0 ? 0 : a >= 255 ? 255 : a;
} }
function findNextFileMarker(data, currentPos, startPos) {
function peekUint16(pos) {
return data[pos] << 8 | data[pos + 1];
}
var maxPos = data.length - 1;
var newPos = startPos < currentPos ? startPos : currentPos;
if (currentPos >= maxPos) {
return null;
}
var currentMarker = peekUint16(currentPos);
if (currentMarker >= 0xFFC0 && currentMarker <= 0xFFFE) {
return {
invalid: null,
marker: currentMarker,
offset: currentPos
};
}
var newMarker = peekUint16(newPos);
while (!(newMarker >= 0xFFC0 && newMarker <= 0xFFFE)) {
if (++newPos >= maxPos) {
return null;
}
newMarker = peekUint16(newPos);
}
return {
invalid: currentMarker.toString(16),
marker: newMarker,
offset: newPos
};
}
JpegImage.prototype = { JpegImage.prototype = {
parse: function parse(data) { parse: function parse(data) {
function readUint16() { function readUint16() {
@ -502,21 +538,12 @@ var JpegImage = function JpegImageClosure() {
return value; return value;
} }
function readDataBlock() { function readDataBlock() {
function isValidMarkerAt(pos) {
if (pos < data.length - 1) {
return data[pos] === 0xFF && data[pos + 1] >= 0xC0 && data[pos + 1] <= 0xFE;
}
return true;
}
var length = readUint16(); var length = readUint16();
var endOffset = offset + length - 2; var endOffset = offset + length - 2;
if (!isValidMarkerAt(endOffset)) { var fileMarker = findNextFileMarker(data, endOffset, offset);
warn('readDataBlock - incorrect length, next marker is: ' + (data[endOffset] << 8 | data[endOffset + 1]).toString('16')); if (fileMarker && fileMarker.invalid) {
var pos = offset; warn('readDataBlock - incorrect length, next marker is: ' + fileMarker.invalid);
while (!isValidMarkerAt(pos)) { endOffset = fileMarker.offset;
pos++;
}
endOffset = pos;
} }
var array = data.subarray(offset, endOffset); var array = data.subarray(offset, endOffset);
offset += array.length; offset += array.length;

4
lib/display/api.js
Unescape View File

@ -1372,8 +1372,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
} }
}; };
}(); }();
exports.version = '1.7.391'; exports.version = '1.7.393';
exports.build = 'cd5acf50'; exports.build = 'ede4d3c7';
exports.getDocument = getDocument; exports.getDocument = getDocument;
exports.PDFDataRangeTransport = PDFDataRangeTransport; exports.PDFDataRangeTransport = PDFDataRangeTransport;
exports.PDFWorker = PDFWorker; exports.PDFWorker = PDFWorker;

4
lib/display/global.js
Unescape View File

@ -31,8 +31,8 @@ if (!globalScope.PDFJS) {
globalScope.PDFJS = {}; globalScope.PDFJS = {};
} }
var PDFJS = globalScope.PDFJS; var PDFJS = globalScope.PDFJS;
PDFJS.version = '1.7.391'; PDFJS.version = '1.7.393';
PDFJS.build = 'cd5acf50'; PDFJS.build = 'ede4d3c7';
PDFJS.pdfBug = false; PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) { if (PDFJS.verbosity !== undefined) {
sharedUtil.setVerbosityLevel(PDFJS.verbosity); sharedUtil.setVerbosityLevel(PDFJS.verbosity);

4
lib/pdf.js
Unescape View File

@ -14,8 +14,8 @@
*/ */
'use strict'; 'use strict';
var pdfjsVersion = '1.7.391'; var pdfjsVersion = '1.7.393';
var pdfjsBuild = 'cd5acf50'; var pdfjsBuild = 'ede4d3c7';
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

@ -14,8 +14,8 @@
*/ */
'use strict'; 'use strict';
var pdfjsVersion = '1.7.391'; var pdfjsVersion = '1.7.393';
var pdfjsBuild = 'cd5acf50'; var pdfjsBuild = 'ede4d3c7';
var pdfjsCoreWorker = require('./core/worker.js'); var pdfjsCoreWorker = require('./core/worker.js');
{ {
require('./core/network.js'); require('./core/network.js');

2
package.json
Unescape View File

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