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

Merge pull request #1242 from notmasteryet/bad-jpx-1

Browse Source 
Recovering from the bad JPX images (#1145)
This commit is contained in:
Brendan Dahl 2012-02-21 11:39:58 -08:00
commit f45f87b70b
1 changed files with 231 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/jpx.js
View File

@ -1052,7 +1052,7 @@ var JpxImage = (function JpxImageClosure() {
} }
r = 0; r = 0;
} }
error('JPX error: Out of packets'); throw 'Out of packets';
}; };
} }
function ResolutionLayerComponentPositionIterator(context) { function ResolutionLayerComponentPositionIterator(context) {
@ -1091,7 +1091,7 @@ var JpxImage = (function JpxImageClosure() {
} }
l = 0; l = 0;
} }
error('JPX error: Out of packets'); throw 'Out of packets';
}; };
} }
function buildPackets(context) { function buildPackets(context) {
@ -1187,7 +1187,7 @@ var JpxImage = (function JpxImageClosure() {
new ResolutionLayerComponentPositionIterator(context); new ResolutionLayerComponentPositionIterator(context);
break; break;
default: default:
error('JPX error: Unsupported progression order ' + progressionOrder); throw 'Unsupported progression order ' + progressionOrder;
} }
} }
function parseTilePackets(context, data, offset, dataLength) { function parseTilePackets(context, data, offset, dataLength) {
@ -1553,6 +1553,7 @@ var JpxImage = (function JpxImageClosure() {
} }
function JpxImage() { function JpxImage() {
this.failOnCorruptedImage = false;
} }
JpxImage.prototype = { JpxImage.prototype = {
load: function jpxImageLoad(url) { load: function jpxImageLoad(url) {
@ -1612,6 +1613,7 @@ var JpxImage = (function JpxImageClosure() {
}, },
parseCodestream: function jpxImageParseCodestream(data, start, end) { parseCodestream: function jpxImageParseCodestream(data, start, end) {
var context = {}; var context = {};
try {
var position = start; var position = start;
while (position < end) { while (position < end) {
var code = readUint16(data, position); var code = readUint16(data, position);
@ -1675,7 +1677,7 @@ var JpxImage = (function JpxImageClosure() {
scalarExpounded = true; scalarExpounded = true;
break; break;
default: default:
error('JPX error: Invalid SQcd value ' + sqcd); throw 'Invalid SQcd value ' + sqcd;
} }
qcd.noQuantization = spqcdSize == 8; qcd.noQuantization = spqcdSize == 8;
qcd.scalarExpounded = scalarExpounded; qcd.scalarExpounded = scalarExpounded;
@ -1728,7 +1730,7 @@ var JpxImage = (function JpxImageClosure() {
scalarExpounded = true; scalarExpounded = true;
break; break;
default: default:
error('JPX error: Invalid SQcd value ' + sqcd); throw 'Invalid SQcd value ' + sqcd;
} }
qcc.noQuantization = spqcdSize == 8; qcc.noQuantization = spqcdSize == 8;
qcc.scalarExpounded = scalarExpounded; qcc.scalarExpounded = scalarExpounded;
@ -1795,7 +1797,7 @@ var JpxImage = (function JpxImageClosure() {
cod.terminationOnEachCodingPass || cod.terminationOnEachCodingPass ||
cod.verticalyStripe || cod.predictableTermination || cod.verticalyStripe || cod.predictableTermination ||
cod.segmentationSymbolUsed) cod.segmentationSymbolUsed)
error('JPX error: Unsupported COD options: ' + uneval(cod)); throw 'Unsupported COD options: ' + uneval(cod);
if (context.mainHeader) if (context.mainHeader)
context.COD = cod; context.COD = cod;
@ -1840,10 +1842,16 @@ var JpxImage = (function JpxImageClosure() {
// skipping content // skipping content
break; break;
default: default:
error('JPX error: Unknown codestream code: ' + code.toString(16)); throw 'Unknown codestream code: ' + code.toString(16);
} }
position += length; position += length;
} }
} catch (e) {
if (this.failOnCorruptedImage)
error('JPX error: ' + e);
else
warn('JPX error: ' + e + '. Trying to recover');
}
this.tiles = transformComponents(context); this.tiles = transformComponents(context);
this.width = context.SIZ.Xsiz - context.SIZ.XOsiz; this.width = context.SIZ.Xsiz - context.SIZ.XOsiz;
this.height = context.SIZ.Ysiz - context.SIZ.YOsiz; this.height = context.SIZ.Ysiz - context.SIZ.YOsiz;