From e3a3ec6f2e3b57bd310ed8cb0d663946dae9b2d2 Mon Sep 17 00:00:00 2001
From: Kalervo Kujala <kkujala@com>
Date: Sun, 29 Jan 2012 22:25:06 +0200
Subject: [PATCH] Use JPX and JPEG in error messages.

Also throw in workerConsole.
---
 src/jpx.js    | 16 ++++++++--------
 src/stream.js |  2 +-
 src/worker.js |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/jpx.js b/src/jpx.js
index c212c6fd0..a15c3db54 100644
--- a/src/jpx.js
+++ b/src/jpx.js
@@ -1052,7 +1052,7 @@ var JpxImage = (function JpxImageClosure() {
         }
         r = 0;
       }
-      error('Out of packets');
+      error('JPX error: Out of packets');
     };
   }
   function ResolutionLayerComponentPositionIterator(context) {
@@ -1091,7 +1091,7 @@ var JpxImage = (function JpxImageClosure() {
         }
         l = 0;
       }
-      error('Out of packets');
+      error('JPX error: Out of packets');
     };
   }
   function buildPackets(context) {
@@ -1187,7 +1187,7 @@ var JpxImage = (function JpxImageClosure() {
           new ResolutionLayerComponentPositionIterator(context);
         break;
       default:
-        error('Unsupported progression order ' + progressionOrder);
+        error('JPX error: Unsupported progression order ' + progressionOrder);
     }
   }
   function parseTilePackets(context, data, offset, dataLength) {
@@ -1589,7 +1589,7 @@ var JpxImage = (function JpxImageClosure() {
         if (lbox == 0)
           lbox = length - position + headerSize;
         if (lbox < headerSize)
-          error('Invalid box field size');
+          error('JPX error: Invalid box field size');
         var dataLength = lbox - headerSize;
         var jumpDataLength = true;
         switch (tbox) {
@@ -1675,7 +1675,7 @@ var JpxImage = (function JpxImageClosure() {
                 scalarExpounded = true;
                 break;
               default:
-                error('Invalid SQcd value ' + sqcd);
+                error('JPX error: Invalid SQcd value ' + sqcd);
             }
             qcd.noQuantization = spqcdSize == 8;
             qcd.scalarExpounded = scalarExpounded;
@@ -1728,7 +1728,7 @@ var JpxImage = (function JpxImageClosure() {
                 scalarExpounded = true;
                 break;
               default:
-                error('Invalid SQcd value ' + sqcd);
+                error('JPX error: Invalid SQcd value ' + sqcd);
             }
             qcc.noQuantization = spqcdSize == 8;
             qcc.scalarExpounded = scalarExpounded;
@@ -1795,7 +1795,7 @@ var JpxImage = (function JpxImageClosure() {
                 cod.terminationOnEachCodingPass ||
                 cod.verticalyStripe || cod.predictableTermination ||
                 cod.segmentationSymbolUsed)
-              error('Unsupported COD options: ' + uneval(cod));
+              error('JPX error: Unsupported COD options: ' + uneval(cod));
 
             if (context.mainHeader)
               context.COD = cod;
@@ -1840,7 +1840,7 @@ var JpxImage = (function JpxImageClosure() {
             // skipping content
             break;
           default:
-            error('Unknown codestream code: ' + code.toString(16));
+            error('JPX error: Unknown codestream code: ' + code.toString(16));
         }
         position += length;
       }
diff --git a/src/stream.js b/src/stream.js
index c7b7c83e6..fc163171f 100644
--- a/src/stream.js
+++ b/src/stream.js
@@ -832,7 +832,7 @@ var JpegStream = (function JpegStreamClosure() {
       this.buffer = data;
       this.bufferLength = data.length;
     } catch (e) {
-      error(e);
+      error('JPEG error: ' + e);
     }
   };
   JpegStream.prototype.getIR = function jpegStreamGetIR() {
diff --git a/src/worker.js b/src/worker.js
index f9777d7df..b81ff0540 100644
--- a/src/worker.js
+++ b/src/worker.js
@@ -208,6 +208,7 @@ var workerConsole = {
       action: 'console_error',
       data: args
     });
+    throw 'pdf.js execution error';
   },
 
   time: function time(name) {