From: sbarman <sbarman@L3CWZ5T.(none)>
Date: Tue, 21 Jun 2011 05:42:26 +0000 (-0700)
Subject: Merge branch 'master' into predictor
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=650df342893d3269f774c0ad06ae1f7365ef2f68;p=pdf.js.git

Merge branch 'master' into predictor
---

650df342893d3269f774c0ad06ae1f7365ef2f68
diff --cc pdf.js
index 7a38b97,fb0aeb7..be324d5
--- a/pdf.js
+++ b/pdf.js
@@@ -539,12 -541,11 +540,15 @@@ var JpegStream = (function() 
      }
  
      constructor.prototype = {
 +        // Needed to pass IsStream test
 +        getChar: function() {
 +        },
 +
          getImage: function() {
              return this.domImage;
+         },
+         getChar: function() {
+             error("internal error: getChar is not valid on JpegStream");
          }
      };