Add support for xobj embedded images that are not rendered by the platform + has...

diff --git a/pdf.js b/pdf.js
index f12f2213a14819ebe3b83a963460fb866cad8b15..db4d23179062a6aa5f3f6889b3c03c9f7d0739f3 100644 (file)
--- a/pdf.js
+++ b/pdf.js
@@ -4272,6 +4272,21 @@ var PartialEvaluator = (function() {
                   var inline = false;
                   
                   var imageObj = new PDFImage(xref, resources, image, inline);
+
+                  if (imageObj.imageMask) {
+                    throw "Can't handle this in the web worker :/";
+                  }
+                  
+                  var imgData = {
+                    width: w,
+                    height: h,
+                    data: new Uint8Array(w * h * 4)
+                  };
+                  var pixels = imgData.data;
+                  imageObj.fillRgbaBuffer(pixels, imageObj.decode);
+                  
+                  fn = "paintReadyImageXObject";
+                  args = [ imgData ];
                   
                   console.log("xobj subtype image", w, h, imageObj.imageMask);
                 }
@@ -4306,13 +4321,13 @@ var PartialEvaluator = (function() {
             }
           }
 
-          var skips = ["paintXObject"];
-
-          if (skips.indexOf(fn) != -1) {
-            // console.log("skipping", fn);
-            args = [];
-            continue;
-          }
+          // var skips = ["paintXObject"];
+          // 
+          // if (skips.indexOf(fn) != -1) {
+          //   // console.log("skipping", fn);
+          //   args = [];
+          //   continue;
+          // }
 
           fnArray.push(fn);
           argsArray.push(args);
@@ -5403,6 +5418,31 @@ var CanvasGraphics = (function() {
       ctx.drawImage(tmpCanvas, 0, -h);
       this.restore();
     },
+    
+    paintReadyImageXObject: function(imgData) {
+      this.save();
+
+      var ctx = this.ctx;
+      var w = imgData.width;
+      var h = imgData.height;
+      // scale the image to the unit square
+      ctx.scale(1 / w, -1 / h);
+
+
+      var tmpCanvas = new this.ScratchCanvas(w, h);
+      var tmpCtx = tmpCanvas.getContext('2d');
+      var tmpImgData = tmpCtx.getImageData(0, 0, w, h);
+
+      // Copy over the imageData.
+      var tmpImgDataPixels = tmpImgData.data;
+      var len = tmpImgDataPixels.length;
+      while (len--) 
+        tmpImgDataPixels[len] = imgData.data[len];
+
+      tmpCtx.putImageData(tmpImgData, 0, 0);
+      ctx.drawImage(tmpCanvas, 0, -h);
+      this.restore();
+    },
 
     // Marked content