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

Merge pull request #400 from notmasteryet/decode-bw

Browse Source 
Fixes inverted B/W images in PIPEHEATCABLE.PDF
This commit is contained in:
Andreas Gal 2011-08-28 14:22:50 -07:00
commit 59f956386c
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pdf.js
View File

@ -5133,7 +5133,7 @@ var CanvasGraphics = (function() {
var inverseDecode = !!imageObj.decode && imageObj.decode[0] > 0; var inverseDecode = !!imageObj.decode && imageObj.decode[0] > 0;
imageObj.applyStencilMask(pixels, inverseDecode); imageObj.applyStencilMask(pixels, inverseDecode);
} else } else
imageObj.fillRgbaBuffer(pixels); imageObj.fillRgbaBuffer(pixels, imageObj.decode);
tmpCtx.putImageData(imgData, 0, 0); tmpCtx.putImageData(imgData, 0, 0);
ctx.drawImage(tmpCanvas, 0, -h); ctx.drawImage(tmpCanvas, 0, -h);
@ -5928,7 +5928,7 @@ var PDFImage = (function() {
}; };
constructor.prototype = { constructor.prototype = {
getComponents: function getComponents(buffer) { getComponents: function getComponents(buffer, decodeMap) {
var bpc = this.bpc; var bpc = this.bpc;
if (bpc == 8) if (bpc == 8)
return buffer; return buffer;
@ -5942,6 +5942,11 @@ var PDFImage = (function() {
var output = new Uint8Array(length); var output = new Uint8Array(length);
if (bpc == 1) { if (bpc == 1) {
var valueZero = 0, valueOne = 255;
if (decodeMap) {
valueZero = decodeMap[0] ? 255 : 0;
valueOne = decodeMap[1] ? 255 : 0;
}
var rowComps = width * numComps; var rowComps = width * numComps;
var mask = 0; var mask = 0;
var buf = 0; var buf = 0;
@ -5959,13 +5964,11 @@ var PDFImage = (function() {
mask = 128; mask = 128;
} }
var t = buf & mask; output[i] = !(buf & mask) ? valueZero : valueOne;
if (t == 0)
output[i] = 0;
else
output[i] = 255;
} }
} else { } else {
if (decodeMap != null)
TODO('interpolate component values');
var rowComps = width * numComps; var rowComps = width * numComps;
var bits = 0; var bits = 0;
var buf = 0; var buf = 0;
@ -6034,7 +6037,7 @@ var PDFImage = (function() {
} }
} }
}, },
fillRgbaBuffer: function fillRgbaBuffer(buffer) { fillRgbaBuffer: function fillRgbaBuffer(buffer, decodeMap) {
var numComps = this.numComps; var numComps = this.numComps;
var width = this.width; var width = this.width;
var height = this.height; var height = this.height;
@ -6044,7 +6047,8 @@ var PDFImage = (function() {
var rowBytes = (width * numComps * bpc + 7) >> 3; var rowBytes = (width * numComps * bpc + 7) >> 3;
var imgArray = this.image.getBytes(height * rowBytes); var imgArray = this.image.getBytes(height * rowBytes);
var comps = this.colorSpace.getRgbBuffer(this.getComponents(imgArray)); var comps = this.colorSpace.getRgbBuffer(
this.getComponents(imgArray, decodeMap));
var compsPos = 0; var compsPos = 0;
var opacity = this.getOpacity(); var opacity = this.getOpacity();
var opacityPos = 0; var opacityPos = 0;

2
test/test.py
View File

@ -136,7 +136,7 @@ class PDFTestHandler(BaseHTTPRequestHandler):
path, _ = url.path, url.query path, _ = url.path, url.query
path = os.path.abspath(os.path.realpath(DOC_ROOT + os.sep + path)) path = os.path.abspath(os.path.realpath(DOC_ROOT + os.sep + path))
prefix = os.path.commonprefix(( path, DOC_ROOT )) prefix = os.path.commonprefix(( path, DOC_ROOT ))
_, ext = os.path.splitext(path) _, ext = os.path.splitext(path.lower())
if url.path == "/favicon.ico": if url.path == "/favicon.ico":
self.sendFile(os.path.join(DOC_ROOT, "test", "resources", "favicon.ico"), ext) self.sendFile(os.path.join(DOC_ROOT, "test", "resources", "favicon.ico"), ext)