fix(decoder): throw Error objects

patrickhulce · patrickhulce · commit e6955d895469 · 2017-06-28T17:47:57.000-07:00
diff --git a/lib/decoder.js b/lib/decoder.js
@@ -109,7 +109,7 @@ var JpegImage = (function jpegImage() {
       if (bitsData == 0xFF) {
         var nextByte = data[offset++];
         if (nextByte) {
-          throw "unexpected marker: " + ((bitsData << 8) | nextByte).toString(16);
+          throw new Error("unexpected marker: " + ((bitsData << 8) | nextByte).toString(16));
         }
         // unstuff 0
       }
@@ -123,7 +123,7 @@ var JpegImage = (function jpegImage() {
         if (typeof node === 'number')
           return node;
         if (typeof node !== 'object')
-          throw "invalid huffman sequence";
+          throw new Error("invalid huffman sequence");
       }
       return null;
     }
@@ -215,7 +215,7 @@ var JpegImage = (function jpegImage() {
             }
           } else {
             if (s !== 1)
-              throw "invalid ACn encoding";
+              throw new Error("invalid ACn encoding");
             successiveACNextValue = receiveAndExtend(s);
             successiveACState = r ? 2 : 3;
           }
@@ -321,7 +321,7 @@ var JpegImage = (function jpegImage() {
       bitsCount = 0;
       marker = (data[offset] << 8) | data[offset + 1];
       if (marker < 0xFF00) {
-        throw "marker was not found";
+        throw new Error("marker was not found");
       }
 
       if (marker >= 0xFFD0 && marker <= 0xFFD7) { // RSTx
@@ -595,7 +595,7 @@ var JpegImage = (function jpegImage() {
       var huffmanTablesAC = [], huffmanTablesDC = [];
       var fileMarker = readUint16();
       if (fileMarker != 0xFFD8) { // SOI (Start of Image)
-        throw "SOI not found";
+        throw new Error("SOI not found");
       }
 
       fileMarker = readUint16();
@@ -667,7 +667,7 @@ var JpegImage = (function jpegImage() {
                   tableData[z] = readUint16();
                 }
               } else
-                throw "DQT: invalid table spec";
+                throw new Error("DQT: invalid table spec");
               quantizationTables[quantizationTableSpec & 15] = tableData;
             }
             break;
@@ -755,12 +755,12 @@ var JpegImage = (function jpegImage() {
               offset -= 3;
               break;
             }
-            throw "unknown JPEG marker " + fileMarker.toString(16);
+            throw new Error("unknown JPEG marker " + fileMarker.toString(16));
         }
         fileMarker = readUint16();
       }
       if (frames.length != 1)
-        throw "only single frame JPEGs supported";
+        throw new Error("only single frame JPEGs supported");
 
       // set each frame's components quantization table
       for (var i = 0; i < frames.length; i++) {

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ var JpegImage = (function jpegImage() {`
`109`	`109`	`if (bitsData == 0xFF) {`
`110`	`110`	`var nextByte = data[offset++];`
`111`	`111`	`if (nextByte) {`
`112`		`- throw "unexpected marker: " + ((bitsData << 8) \| nextByte).toString(16);`
	`112`	`+ throw new Error("unexpected marker: " + ((bitsData << 8) \| nextByte).toString(16));`
`113`	`113`	`}`
`114`	`114`	`// unstuff 0`
`115`	`115`	`}`
`@@ -123,7 +123,7 @@ var JpegImage = (function jpegImage() {`
`123`	`123`	`if (typeof node === 'number')`
`124`	`124`	`return node;`
`125`	`125`	`if (typeof node !== 'object')`
`126`		`- throw "invalid huffman sequence";`
	`126`	`+ throw new Error("invalid huffman sequence");`
`127`	`127`	`}`
`128`	`128`	`return null;`
`129`	`129`	`}`
`@@ -215,7 +215,7 @@ var JpegImage = (function jpegImage() {`
`215`	`215`	`}`
`216`	`216`	`} else {`
`217`	`217`	`if (s !== 1)`
`218`		`- throw "invalid ACn encoding";`
	`218`	`+ throw new Error("invalid ACn encoding");`
`219`	`219`	`successiveACNextValue = receiveAndExtend(s);`
`220`	`220`	`successiveACState = r ? 2 : 3;`
`221`	`221`	`}`
`@@ -321,7 +321,7 @@ var JpegImage = (function jpegImage() {`
`321`	`321`	`bitsCount = 0;`
`322`	`322`	`marker = (data[offset] << 8) \| data[offset + 1];`
`323`	`323`	`if (marker < 0xFF00) {`
`324`		`- throw "marker was not found";`
	`324`	`+ throw new Error("marker was not found");`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`if (marker >= 0xFFD0 && marker <= 0xFFD7) { // RSTx`
`@@ -595,7 +595,7 @@ var JpegImage = (function jpegImage() {`
`595`	`595`	`var huffmanTablesAC = [], huffmanTablesDC = [];`
`596`	`596`	`var fileMarker = readUint16();`
`597`	`597`	`if (fileMarker != 0xFFD8) { // SOI (Start of Image)`
`598`		`- throw "SOI not found";`
	`598`	`+ throw new Error("SOI not found");`
`599`	`599`	`}`
`600`	`600`
`601`	`601`	`fileMarker = readUint16();`
`@@ -667,7 +667,7 @@ var JpegImage = (function jpegImage() {`
`667`	`667`	`tableData[z] = readUint16();`
`668`	`668`	`}`
`669`	`669`	`} else`
`670`		`- throw "DQT: invalid table spec";`
	`670`	`+ throw new Error("DQT: invalid table spec");`
`671`	`671`	`quantizationTables[quantizationTableSpec & 15] = tableData;`
`672`	`672`	`}`
`673`	`673`	`break;`
`@@ -755,12 +755,12 @@ var JpegImage = (function jpegImage() {`
`755`	`755`	`offset -= 3;`
`756`	`756`	`break;`
`757`	`757`	`}`
`758`		`- throw "unknown JPEG marker " + fileMarker.toString(16);`
	`758`	`+ throw new Error("unknown JPEG marker " + fileMarker.toString(16));`
`759`	`759`	`}`
`760`	`760`	`fileMarker = readUint16();`
`761`	`761`	`}`
`762`	`762`	`if (frames.length != 1)`
`763`		`- throw "only single frame JPEGs supported";`
	`763`	`+ throw new Error("only single frame JPEGs supported");`
`764`	`764`
`765`	`765`	`// set each frame's components quantization table`
`766`	`766`	`for (var i = 0; i < frames.length; i++) {`