PDF.js version 1.0.310

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.308",
+  "version": "1.0.310",
   "keywords": [
     "Mozilla",
     "pdf",

build/pdf.combined.js

@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.308';
-PDFJS.build = 'fc85cfd';
+PDFJS.version = '1.0.310';
+PDFJS.build = 'cff2c3a';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -35704,13 +35704,13 @@ var PDFImage = (function PDFImageClosure() {
           }
           return imgData;
         }
-      }
-      if (this.image instanceof JpegStream) {
+        if (this.image instanceof JpegStream && !this.smask && !this.mask) {
           imgData.kind = ImageKind.RGB_24BPP;
           imgData.data = this.getImageBytes(originalHeight * rowBytes,
-                                          drawWidth, drawHeight);
+                                            drawWidth, drawHeight, true);
           return imgData;
         }
+      }
 
       imgArray = this.getImageBytes(originalHeight * rowBytes);
       // imgArray can be incomplete (e.g. after CCITT fax encoding).
@@ -35797,10 +35797,12 @@ var PDFImage = (function PDFImageClosure() {
     },
 
     getImageBytes: function PDFImage_getImageBytes(length,
-                                                   drawWidth, drawHeight) {
+                                                   drawWidth, drawHeight,
+                                                   forceRGB) {
       this.image.reset();
-      this.image.drawWidth = drawWidth;
-      this.image.drawHeight = drawHeight;
+      this.image.drawWidth = drawWidth || this.width;
+      this.image.drawHeight = drawHeight || this.height;
+      this.image.forceRGB = !!forceRGB;
       return this.image.getBytes(length);
     }
   };
@@ -40688,7 +40690,7 @@ var JpegStream = (function JpegStreamClosure() {
 
       jpegImage.parse(this.bytes);
       var data = jpegImage.getData(this.drawWidth, this.drawHeight,
-                                   /* forceRGBoutput = */true);
+                                   this.forceRGB);
       this.buffer = data;
       this.bufferLength = data.length;
       this.eof = true;
@@ -43804,7 +43806,7 @@ var JpegImage = (function jpegImage() {
           } else {
             return this._convertYcckToCmyk(data);
           }
-        } else {
+        } else if (forceRGBoutput) {
           return this._convertCmykToRgb(data);
         }
       }

build/pdf.js

@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.308';
-PDFJS.build = 'fc85cfd';
+PDFJS.version = '1.0.310';
+PDFJS.build = 'cff2c3a';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it

build/pdf.worker.js

@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.308';
-PDFJS.build = 'fc85cfd';
+PDFJS.version = '1.0.310';
+PDFJS.build = 'cff2c3a';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -31197,13 +31197,13 @@ var PDFImage = (function PDFImageClosure() {
           }
           return imgData;
         }
-      }
-      if (this.image instanceof JpegStream) {
+        if (this.image instanceof JpegStream && !this.smask && !this.mask) {
           imgData.kind = ImageKind.RGB_24BPP;
           imgData.data = this.getImageBytes(originalHeight * rowBytes,
-                                          drawWidth, drawHeight);
+                                            drawWidth, drawHeight, true);
           return imgData;
         }
+      }
 
       imgArray = this.getImageBytes(originalHeight * rowBytes);
       // imgArray can be incomplete (e.g. after CCITT fax encoding).
@@ -31290,10 +31290,12 @@ var PDFImage = (function PDFImageClosure() {
     },
 
     getImageBytes: function PDFImage_getImageBytes(length,
-                                                   drawWidth, drawHeight) {
+                                                   drawWidth, drawHeight,
+                                                   forceRGB) {
       this.image.reset();
-      this.image.drawWidth = drawWidth;
-      this.image.drawHeight = drawHeight;
+      this.image.drawWidth = drawWidth || this.width;
+      this.image.drawHeight = drawHeight || this.height;
+      this.image.forceRGB = !!forceRGB;
       return this.image.getBytes(length);
     }
   };
@@ -36181,7 +36183,7 @@ var JpegStream = (function JpegStreamClosure() {
 
       jpegImage.parse(this.bytes);
       var data = jpegImage.getData(this.drawWidth, this.drawHeight,
-                                   /* forceRGBoutput = */true);
+                                   this.forceRGB);
       this.buffer = data;
       this.bufferLength = data.length;
       this.eof = true;
@@ -39297,7 +39299,7 @@ var JpegImage = (function jpegImage() {
           } else {
             return this._convertYcckToCmyk(data);
           }
-        } else {
+        } else if (forceRGBoutput) {
           return this._convertCmykToRgb(data);
         }
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.308",
+  "version": "1.0.310",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",