From: Kalervo Kujala <kkujala@com>
Date: Thu, 8 Dec 2011 22:28:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into style
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cd01302de8f58c77b1a07779b87cbb3e324b9a94;p=pdf.js.git

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

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

cd01302de8f58c77b1a07779b87cbb3e324b9a94
diff --cc src/image.js
index 0688d07,217e081..15c31b0
--- a/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/pattern.js
index bf68253,aa4667e..dbe2e5c
--- a/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];