]> git.parisson.com Git - pdf.js.git/commitdiff
Address review comments by yury
authorJulian Viereck <julian.viereck@gmail.com>
Wed, 7 Dec 2011 18:03:13 +0000 (19:03 +0100)
committerJulian Viereck <julian.viereck@gmail.com>
Wed, 7 Dec 2011 18:07:00 +0000 (19:07 +0100)
src/core.js
src/image.js
src/obj.js

index a52f2bdd05c68e89a242445d58b5c055546e87b5..980a7b1e9b44796d4b8f17fcb81935f687b570e3 100644 (file)
@@ -561,14 +561,7 @@ var PDFDoc = (function pdfDoc() {
         switch (type) {
           case 'JpegStream':
             var imageData = data[2];
-
-            var src = 'data:image/jpeg;base64,' + window.btoa(imageData);
-            var img = new Image();
-            img.onload = (function jpegImageLoaderOnload() {
-              this.objs.resolve(id, img);
-            }).bind(this);
-            img.src = src;
-
+            loadJpegStream(id, imageData, this.objs);
             break;
           case 'Font':
             var name = data[2];
index 5392202c7c5dcdce90f8641c48e7a458e8396880..217e081c21fce0f42c289b06e7bb23968eca93b1 100644 (file)
@@ -228,3 +228,11 @@ var PDFImage = (function pdfImage() {
   };
   return constructor;
 })();
+
+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);
+}
index e00e54b91a8be2e8c7ddc82373aed5e85bab6458..e105e2e650260c84539faf9fa1984b393c43fa1f 100644 (file)
@@ -589,7 +589,7 @@ var XRef = (function xRefXRef() {
           e = parser.getObj();
         }
         // Don't cache streams since they are mutable (except images).
-        if (!isStream(e) || e.src)
+        if (!isStream(e) || e instanceof JpegStream)
           this.cache[num] = e;
         return e;
       }