Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use RGB_24BPP form for all images lacking alpha data.

Browse Source
This commit is contained in:
Nicholas Nethercote 2014-03-03 20:46:42 -08:00
parent ba95e0b07b
commit a2fe30ff38
2 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/image.js
View File

@ -383,7 +383,7 @@ var PDFImage = (function PDFImageClosure() {
rgbaBuf[j] = alphaBuf[i]; rgbaBuf[j] = alphaBuf[i];
} }
} else { } else {
// Common case: no mask (and no need to allocate the extra buffer). // No mask.
for (var i = 0, j = 3, ii = width * actualHeight; i < ii; ++i, j += 4) { for (var i = 0, j = 3, ii = width * actualHeight; i < ii; ++i, j += 4) {
rgbaBuf[j] = 255; rgbaBuf[j] = 255;
} }
@ -467,23 +467,35 @@ var PDFImage = (function PDFImageClosure() {
var comps = this.getComponents(imgArray); var comps = this.getComponents(imgArray);
var rgbaBuf = new Uint8Array(drawWidth * drawHeight * 4); // If opacity data is present, use RGBA_32BPP form. Otherwise, use the
// more compact RGB_24BPP form if allowable.
var alpha01, maybeUndoPreblend;
if (!forceRGBA && !this.smask && !this.mask) {
imgData.kind = ImageKind.RGB_24BPP;
imgData.data = new Uint8Array(drawWidth * drawHeight * 3);
alpha01 = 0;
maybeUndoPreblend = false;
} else {
imgData.kind = ImageKind.RGBA_32BPP;
imgData.data = new Uint8Array(drawWidth * drawHeight * 4);
alpha01 = 1;
maybeUndoPreblend = true;
// Handle opacity here since color key masking needs to be performed on // Color key masking (opacity) must be performed before decoding.
// undecoded values. this.fillOpacity(imgData.data, drawWidth, drawHeight, actualHeight,
this.fillOpacity(rgbaBuf, drawWidth, drawHeight, actualHeight, comps); comps);
}
if (this.needsDecode) { if (this.needsDecode) {
this.decodeBuffer(comps); this.decodeBuffer(comps);
} }
this.colorSpace.fillRgb(imgData.data, originalWidth, originalHeight,
drawWidth, drawHeight, actualHeight, bpc, comps,
alpha01);
if (maybeUndoPreblend) {
this.undoPreblend(imgData.data, drawWidth, actualHeight);
}
this.colorSpace.fillRgb(rgbaBuf, originalWidth, originalHeight, drawWidth,
drawHeight, actualHeight, bpc, comps);
this.undoPreblend(rgbaBuf, drawWidth, actualHeight);
imgData.kind = ImageKind.RGBA_32BPP;
imgData.data = rgbaBuf;
return imgData; return imgData;
}, },
fillGrayBuffer: function PDFImage_fillGrayBuffer(buffer) { fillGrayBuffer: function PDFImage_fillGrayBuffer(buffer) {

37
src/shared/colorspace.js
View File

@ -74,11 +74,13 @@ var ColorSpace = (function ColorSpaceClosure() {
return false; return false;
}, },
/** /**
* Fills in the RGB colors in an RGBA buffer. * Fills in the RGB colors in the destination buffer. alpha01 indicates
* how many alpha components there are in the dest array; it will be either
* 0 (RGB array) or 1 (RGBA array).
*/ */
fillRgb: function ColorSpace_fillRgb(rgbaBuf, originalWidth, fillRgb: function ColorSpace_fillRgb(dest, originalWidth,
originalHeight, width, height, originalHeight, width, height,
actualHeight, bpc, comps) { actualHeight, bpc, comps, alpha01) {
var count = originalWidth * originalHeight; var count = originalWidth * originalHeight;
var rgbBuf = null; var rgbBuf = null;
var numComponentColors = 1 << bpc; var numComponentColors = 1 << bpc;
@ -108,14 +110,14 @@ var ColorSpace = (function ColorSpaceClosure() {
/* alpha01 = */ 0); /* alpha01 = */ 0);
if (!needsResizing) { if (!needsResizing) {
// Fill in the RGB values directly into |rgbaBuf|. // Fill in the RGB values directly into |dest|.
var rgbaPos = 0; var destPos = 0;
for (var i = 0; i < count; ++i) { for (var i = 0; i < count; ++i) {
var key = comps[i] * 3; var key = comps[i] * 3;
rgbaBuf[rgbaPos++] = colorMap[key]; dest[destPos++] = colorMap[key];
rgbaBuf[rgbaPos++] = colorMap[key + 1]; dest[destPos++] = colorMap[key + 1];
rgbaBuf[rgbaPos++] = colorMap[key + 2]; dest[destPos++] = colorMap[key + 2];
rgbaPos++; destPos += alpha01;
} }
} else { } else {
rgbBuf = new Uint8Array(count * 3); rgbBuf = new Uint8Array(count * 3);
@ -129,9 +131,9 @@ var ColorSpace = (function ColorSpaceClosure() {
} }
} else { } else {
if (!needsResizing) { if (!needsResizing) {
// Fill in the RGB values directly into |rgbaBuf|. // Fill in the RGB values directly into |dest|.
this.getRgbBuffer(comps, 0, width * actualHeight, rgbaBuf, 0, bpc, this.getRgbBuffer(comps, 0, width * actualHeight, dest, 0, bpc,
/* alpha01 = */ 1); alpha01);
} else { } else {
rgbBuf = new Uint8Array(count * 3); rgbBuf = new Uint8Array(count * 3);
this.getRgbBuffer(comps, 0, count, rgbBuf, 0, bpc, this.getRgbBuffer(comps, 0, count, rgbBuf, 0, bpc,
@ -145,11 +147,12 @@ var ColorSpace = (function ColorSpaceClosure() {
originalHeight, width, height); originalHeight, width, height);
} }
var rgbPos = 0; var rgbPos = 0;
var actualLength = width * actualHeight * 4; var destPos = 0;
for (var i = 0; i < actualLength; i += 4) { for (var i = 0, ii = width * actualHeight; i < ii; i++) {
rgbaBuf[i] = rgbBuf[rgbPos++]; dest[destPos++] = rgbBuf[rgbPos++];
rgbaBuf[i + 1] = rgbBuf[rgbPos++]; dest[destPos++] = rgbBuf[rgbPos++];
rgbaBuf[i + 2] = rgbBuf[rgbPos++]; dest[destPos++] = rgbBuf[rgbPos++];
destPos += alpha01;
} }
} }
}, },