Merge remote-tracking branch 'upstream/master' into style

Conflicts:
	src/image.js
	src/pattern.js

diff --cc src/canvas.js
Simple merge

diff --cc src/core.js
Simple merge

diff --cc src/fonts.js
Simple merge

diff --cc src/image.js
index 0688d07ef3365ff54089d26454e36d76a7fe582f,217e081c21fce0f42c289b06e7bb23968eca93b1..15c31b034c848fd062f51402f11b104814a30133
--- 1/src/image.js
--- 2/src/image.js
+++ b/src/image.js
@@@ -226,32 -226,13 +226,14 @@@ var PDFImage = (function PDFImageClosur
          buffer[i] = comps[i];
      }
    };
 -  return constructor;
 +  return PDFImage;
  })();
  
- var JpegImageLoader = (function JpegImageLoaderClosure() {
-   function JpegImageLoader(objId, imageData, objs) {
-     var src = 'data:image/jpeg;base64,' + window.btoa(imageData);
- 
-     var img = new Image();
-     img.onload = (function onloadClosure() {
-       this.loaded = true;
- 
-       objs.resolve(objId, this);
- 
-       if (this.onLoad)
-         this.onLoad();
-     }).bind(this);
-     img.src = src;
-     this.domImage = img;
-   }
- 
-   JpegImageLoader.prototype = {
-     getImage: function jpegImageLoaderGetImage() {
-       return this.domImage;
-     }
-   };
- 
-   return JpegImageLoader;
- })();
+ function loadJpegStream(id, imageData, objs) {
+   var img = new Image();
+   img.onload = (function jpegImageLoaderOnload() {
+     objs.resolve(id, img);
+   });
+   img.src = 'data:image/jpeg;base64,' + window.btoa(imageData);
+ }
 +

diff --cc src/obj.js
Simple merge

diff --cc src/pattern.js
index bf68253b35092e23effcb4e81033d84ec3864158,aa4667e079920d7c88b57d87b37fb80fb740f5d8..dbe2e5c23111e18c6d9a389f0487d210765d38f3
--- 1/src/pattern.js
--- 2/src/pattern.js
+++ b/src/pattern.js
@@@ -179,11 -179,15 +179,15 @@@ Shadings.Dummy = (function DummyClosure
        return ['Dummy'];
      }
    };
 -  return constructor;
 +  return Dummy;
  })();
  
 -var TilingPattern = (function tilingPattern() {
 +var TilingPattern = (function TilingPatternClosure() {
-   var PAINT_TYPE_COLORED = 1, PAINT_TYPE_UNCOLORED = 2;
+   var PaintType = {
+     COLORED: 1,
+     UNCOLORED: 2
+   };
+   var MAX_PATTERN_SIZE = 512;
  
    function TilingPattern(IR, color, ctx, objs) {
      var IRQueue = IR[2];