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

Refactoring error reporting in JPX

Browse Source
This commit is contained in:
Yury Delendik 2014-06-13 18:18:49 -05:00
parent 34298e4ba7
commit 9f51e46917
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/jpx.js
View File

@ -58,7 +58,7 @@ var JpxImage = (function JpxImageClosure() {
lbox = length - position + headerSize; lbox = length - position + headerSize;
} }
if (lbox < headerSize) { if (lbox < headerSize) {
throw 'JPX error: Invalid box field size'; throw new Error('JPX Error: Invalid box field size');
} }
var dataLength = lbox - headerSize; var dataLength = lbox - headerSize;
var jumpDataLength = true; var jumpDataLength = true;
@ -104,7 +104,7 @@ var JpxImage = (function JpxImageClosure() {
return; return;
} }
} }
throw 'JPX error: No size marker found in JPX stream'; throw new Error('JPX Error: No size marker found in JPX stream');
}, },
parseCodestream: function JpxImage_parseCodestream(data, start, end) { parseCodestream: function JpxImage_parseCodestream(data, start, end) {
var context = {}; var context = {};
@ -177,7 +177,7 @@ var JpxImage = (function JpxImageClosure() {
scalarExpounded = true; scalarExpounded = true;
break; break;
default: default:
throw 'Invalid SQcd value ' + sqcd; throw new Error('JPX Error: Invalid SQcd value ' + sqcd);
} }
qcd.noQuantization = (spqcdSize == 8); qcd.noQuantization = (spqcdSize == 8);
qcd.scalarExpounded = scalarExpounded; qcd.scalarExpounded = scalarExpounded;
@ -229,7 +229,7 @@ var JpxImage = (function JpxImageClosure() {
scalarExpounded = true; scalarExpounded = true;
break; break;
default: default:
throw 'Invalid SQcd value ' + sqcd; throw new Error('JPX Error: Invalid SQcd value ' + sqcd);
} }
qcc.noQuantization = (spqcdSize == 8); qcc.noQuantization = (spqcdSize == 8);
qcc.scalarExpounded = scalarExpounded; qcc.scalarExpounded = scalarExpounded;
@ -313,8 +313,8 @@ var JpxImage = (function JpxImageClosure() {
} }
if (unsupported.length > 0) { if (unsupported.length > 0) {
doNotRecover = true; doNotRecover = true;
throw 'Unsupported COD options (' + unsupported.join(', ') + throw new Error('JPX Error: Unsupported COD options (' +
')'; unsupported.join(', ') + ')');
} }
if (context.mainHeader) { if (context.mainHeader) {
context.COD = cod; context.COD = cod;
@ -358,17 +358,19 @@ var JpxImage = (function JpxImageClosure() {
// skipping content // skipping content
break; break;
case 0xFF53: // Coding style component (COC) case 0xFF53: // Coding style component (COC)
throw 'Codestream code 0xFF53 (COC) is not implemented'; throw new Error('JPX Error: Codestream code 0xFF53 (COC) is ' +
'not implemented');
default: default:
throw 'Unknown codestream code: ' + code.toString(16); throw new Error('JPX Error: Unknown codestream code: ' +
code.toString(16));
} }
position += length; position += length;
} }
} catch (e) { } catch (e) {
if (doNotRecover || this.failOnCorruptedImage) { if (doNotRecover || this.failOnCorruptedImage) {
throw 'JPX error: ' + e; throw e;
} else { } else {
warn('JPX error: ' + e + '. Trying to recover'); warn('Trying to recover from ' + e.message);
} }
} }
this.tiles = transformComponents(context); this.tiles = transformComponents(context);
@ -596,7 +598,7 @@ var JpxImage = (function JpxImageClosure() {
} }
r = 0; r = 0;
} }
throw 'Out of packets'; throw new Error('JPX Error: Out of packets');
}; };
} }
function ResolutionLayerComponentPositionIterator(context) { function ResolutionLayerComponentPositionIterator(context) {
@ -636,7 +638,7 @@ var JpxImage = (function JpxImageClosure() {
} }
l = 0; l = 0;
} }
throw 'Out of packets'; throw new Error('JPX Error: Out of packets');
}; };
} }
function buildPackets(context) { function buildPackets(context) {
@ -731,7 +733,8 @@ var JpxImage = (function JpxImageClosure() {
new ResolutionLayerComponentPositionIterator(context); new ResolutionLayerComponentPositionIterator(context);
break; break;
default: default:
throw 'Unsupported progression order ' + progressionOrder; throw new Error('JPX Error: Unsupported progression order ' +
progressionOrder);
} }
} }
function parseTilePackets(context, data, offset, dataLength) { function parseTilePackets(context, data, offset, dataLength) {
@ -1644,7 +1647,7 @@ var JpxImage = (function JpxImageClosure() {
(decoder.readBit(contexts, UNIFORM_CONTEXT) << 1) | (decoder.readBit(contexts, UNIFORM_CONTEXT) << 1) |
decoder.readBit(contexts, UNIFORM_CONTEXT); decoder.readBit(contexts, UNIFORM_CONTEXT);
if (symbol != 0xA) { if (symbol != 0xA) {
throw 'Invalid segmentation symbol'; throw new Error('JPX Error: Invalid segmentation symbol');
} }
} }
}; };