From d76f5f681531937276a4a379a56a2efafb123166 Mon Sep 17 00:00:00 2001 From: Brendan Dahl Date: Tue, 13 Dec 2011 08:48:27 -0800 Subject: [PATCH 1/5] Playing with initial decode map impl. --- src/evaluator.js | 2 +- src/image.js | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/evaluator.js b/src/evaluator.js index edef57f91..5c20c8660 100644 --- a/src/evaluator.js +++ b/src/evaluator.js @@ -227,7 +227,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() { data: new Uint8Array(w * h * 4) }; var pixels = imgData.data; - imageObj.fillRgbaBuffer(pixels, imageObj.decode); + imageObj.fillRgbaBuffer(pixels); handler.send('obj', [objId, 'Image', imgData]); }, handler, xref, resources, image, inline); } diff --git a/src/image.js b/src/image.js index 987542c58..8adae5030 100644 --- a/src/image.js +++ b/src/image.js @@ -104,10 +104,13 @@ var PDFImage = (function PDFImageClosure() { }; PDFImage.prototype = { - getComponents: function getComponents(buffer, decodeMap) { + getComponents: function getComponents(buffer) { var bpc = this.bpc; - if (bpc == 8) - return buffer; + var decodeMap = this.decode; + //if (decodeMap) + // debugger; + //if (bpc == 8) + // return buffer; var width = this.width; var height = this.height; @@ -160,6 +163,14 @@ var PDFImage = (function PDFImageClosure() { var remainingBits = bits - bpc; output[i] = buf >> remainingBits; + if (decodeMap) { + var x = output[i]; + var dmin = decodeMap[0]; + var dmax = decodeMap[1]; + var max = Math.pow(2, bpc) - 1; + var val = max * (dmin + x * ((dmax - dmin)/(max))); + output[i] = val; + } buf = buf & ((1 << remainingBits) - 1); bits = remainingBits; } @@ -210,7 +221,7 @@ var PDFImage = (function PDFImageClosure() { } } }, - fillRgbaBuffer: function fillRgbaBuffer(buffer, decodeMap) { + fillRgbaBuffer: function fillRgbaBuffer(buffer) { var numComps = this.numComps; var width = this.width; var height = this.height; @@ -221,7 +232,7 @@ var PDFImage = (function PDFImageClosure() { var imgArray = this.getImageBytes(height * rowBytes); var comps = this.colorSpace.getRgbBuffer( - this.getComponents(imgArray, decodeMap), bpc); + this.getComponents(imgArray), bpc); var compsPos = 0; var opacity = this.getOpacity(); var opacityPos = 0; From 55bbcbc6649504779c1469ecd8a4620466b5f5c0 Mon Sep 17 00:00:00 2001 From: Brendan Dahl Date: Tue, 13 Dec 2011 13:53:22 -0800 Subject: [PATCH 2/5] Working improved version. Still need to refactor default decode stuff. --- src/image.js | 87 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 70 insertions(+), 17 deletions(-) diff --git a/src/image.js b/src/image.js index 8adae5030..f848b12ae 100644 --- a/src/image.js +++ b/src/image.js @@ -24,6 +24,16 @@ var PDFImage = (function PDFImageClosure() { promise.resolve(image); } } + /** + * Decode and clamp a value. + */ + function decode(value, addend, coefficient, max) { + // This formula is different from the spec because we don't decode to + // float range [0,1], we decode it in the [0,max] range. + value = addend + value * coefficient; + // Clamp the value to the range + return value < 0 ? 0 : value > max ? max : value; + } function PDFImage(xref, res, image, inline, smask) { this.image = image; if (image.getParams) { @@ -69,6 +79,18 @@ var PDFImage = (function PDFImageClosure() { } this.decode = dict.get('Decode', 'D'); + if (this.decode && !this.hasDefaultDecode()) { + // Do some preprocessing to avoid more math. + var max = (1 << bitsPerComponent) - 1; + this.decodeCoefficients = []; + this.decodeAddends = []; + for (var i = 0, j = 0; i < this.decode.length; i += 2, ++j) { + var dmin = this.decode[i]; + var dmax = this.decode[i + 1]; + this.decodeCoefficients[j] = dmax - dmin; + this.decodeAddends[j] = max * dmin; + } + } var mask = xref.fetchIfRef(dict.get('Mask')); @@ -106,23 +128,40 @@ var PDFImage = (function PDFImageClosure() { PDFImage.prototype = { getComponents: function getComponents(buffer) { var bpc = this.bpc; + var defaultDecode = this.hasDefaultDecode(); var decodeMap = this.decode; - //if (decodeMap) - // debugger; - //if (bpc == 8) - // return buffer; - + if (decodeMap) console.time('getComps'); + // This image doesn't require extra work + if (bpc == 8 && defaultDecode) + return buffer; + var bufferLength = buffer.length; var width = this.width; var height = this.height; var numComps = this.numComps; - var length = width * height; + var length = width * height * numComps; var bufferPos = 0; var output = bpc <= 8 ? new Uint8Array(length) : bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length); var rowComps = width * numComps; + var decodeAddends, decodeCoefficients; + if (!defaultDecode) { + decodeAddends = this.decodeAddends; + decodeCoefficients = this.decodeCoefficients; + } + var max = (1 << bpc) - 1; - if (bpc == 1) { + if (bpc == 8) { + // Optimization for reading 8 bpc images that have a decode. + for (var i = 0, ii = length; i < ii; ++i) { + var compIndex = i % numComps; + var value = buffer[i]; + value = decode(value, decodeAddends[compIndex], + decodeCoefficients[compIndex], max); + output[i] = value; + } + } else if (bpc == 1) { + // Optimization for reading 1 bpc images. var valueZero = 0, valueOne = 1; if (decodeMap) { valueZero = decodeMap[0] ? 1 : 0; @@ -147,8 +186,7 @@ var PDFImage = (function PDFImageClosure() { output[i] = !(buf & mask) ? valueZero : valueOne; } } else { - if (decodeMap != null) - TODO('interpolate component values'); + // The general case that handles all other bpc values. var bits = 0, buf = 0; for (var i = 0, ii = length; i < ii; ++i) { if (i % rowComps == 0) { @@ -162,19 +200,18 @@ var PDFImage = (function PDFImageClosure() { } var remainingBits = bits - bpc; - output[i] = buf >> remainingBits; - if (decodeMap) { - var x = output[i]; - var dmin = decodeMap[0]; - var dmax = decodeMap[1]; - var max = Math.pow(2, bpc) - 1; - var val = max * (dmin + x * ((dmax - dmin)/(max))); - output[i] = val; + var value = buf >> remainingBits; + if (!defaultDecode) { + var compIndex = i % numComps; + value = decode(value, decodeAddends[compIndex], + decodeCoefficients[compIndex], max); } + output[i] = value; buf = buf & ((1 << remainingBits) - 1); bits = remainingBits; } } + if(decodeMap) console.timeEnd('getComps'); return output; }, getOpacity: function getOpacity() { @@ -267,6 +304,22 @@ var PDFImage = (function PDFImageClosure() { getImageBytes: function getImageBytes(length) { this.image.reset(); return this.image.getBytes(length); + }, + hasDefaultDecode: function hasDefaultDecode() { + // TODO lab color as a way different decode map + if (!this.decode) + return true; + var numComps = this.numComps; + var decode = this.decode; + if (numComps * 2 !== decode.length) { + warning('The decode map is not the correct length'); + return true; + } + for (var i = 0, ii = decode.length; i < ii; i += 2) { + if (decode[i] != 0 || decode[i + 1] != 1) + return false; + } + return true; } }; return PDFImage; From ff1d804fd706e709ab240364a862e5c2557fd30f Mon Sep 17 00:00:00 2001 From: Brendan Dahl Date: Tue, 13 Dec 2011 14:35:46 -0800 Subject: [PATCH 3/5] Move the default decode to logic to the colorspace. --- src/colorspace.js | 40 ++++++++++++++++++++++++++++++++++++++++ src/image.js | 45 ++++++++++++++++----------------------------- 2 files changed, 56 insertions(+), 29 deletions(-) diff --git a/src/colorspace.js b/src/colorspace.js index 231ff6923..87d0083c0 100644 --- a/src/colorspace.js +++ b/src/colorspace.js @@ -154,6 +154,29 @@ var ColorSpace = (function ColorSpaceClosure() { } return null; }; + /** + * Checks if a decode map matches the default decode map for a color space. + * This handles the general decode maps where there are two values per + * component. e.g. [0, 1, 0, 1, 0, 1] for a RGB color. + * This does not handle Lab, Indexed, or Pattern decode maps since they are + * slightly different. + * @param {Array} decode Decode map (usually from an image). + * @param {Number} n Number of components the color space has. + */ + ColorSpace.isDefaultDecode = function colorSpaceIsDefaultDecode(decode, n) { + if (!decode) + return true; + + if (n * 2 !== decode.length) { + warning('The decode map is not the correct length'); + return true; + } + for (var i = 0, ii = decode.length; i < ii; i += 2) { + if (decode[i] != 0 || decode[i + 1] != 1) + return false; + } + return true; + }; return ColorSpace; })(); @@ -200,6 +223,9 @@ var AlternateCS = (function AlternateCSClosure() { baseBuf[pos++] = 255 * tinted[j]; } return base.getRgbBuffer(baseBuf, 8); + }, + isDefaultDecode: function altcs_isDefaultDecode(decodeMap) { + ColorSpace.isDefaultDecode(decodeMap, this.numComps); } }; @@ -267,6 +293,10 @@ var IndexedCS = (function IndexedCSClosure() { } return base.getRgbBuffer(baseBuf, 8); + }, + isDefaultDecode: function indexcs_isDefaultDecode(decodeMap) { + // indexed color maps shouldn't be changed + return true; } }; return IndexedCS; @@ -295,6 +325,9 @@ var DeviceGrayCS = (function DeviceGrayCSClosure() { rgbBuf[j++] = c; } return rgbBuf; + }, + isDefaultDecode: function graycs_isDefaultDecode(decodeMap) { + ColorSpace.isDefaultDecode(decodeMap, this.numComps); } }; return DeviceGrayCS; @@ -319,6 +352,10 @@ var DeviceRgbCS = (function DeviceRgbCSClosure() { for (i = 0; i < length; ++i) rgbBuf[i] = (scale * input[i]) | 0; return rgbBuf; + }, + isDefaultDecode: function rgbcs_isDefaultDecode(decodeMap) { + return 0 == decodeMap[0] == decodeMap[2] == decodeMap[4] && + 1 == decodeMap[1] == decodeMap[3] == decoeMap[5]; } }; return DeviceRgbCS; @@ -403,6 +440,9 @@ var DeviceCmykCS = (function DeviceCmykCSClosure() { } return rgbBuf; + }, + isDefaultDecode: function cmykcs_isDefaultDecode(decodeMap) { + ColorSpace.isDefaultDecode(decodeMap, this.numComps); } }; diff --git a/src/image.js b/src/image.js index f848b12ae..2f99dee54 100644 --- a/src/image.js +++ b/src/image.js @@ -25,11 +25,10 @@ var PDFImage = (function PDFImageClosure() { } } /** - * Decode and clamp a value. + * Decode and clamp a value. The formula is different from the spec because we + * don't decode to float range [0,1], we decode it in the [0,max] range. */ - function decode(value, addend, coefficient, max) { - // This formula is different from the spec because we don't decode to - // float range [0,1], we decode it in the [0,max] range. + function decodeAndClamp(value, addend, coefficient, max) { value = addend + value * coefficient; // Clamp the value to the range return value < 0 ? 0 : value > max ? max : value; @@ -79,7 +78,10 @@ var PDFImage = (function PDFImageClosure() { } this.decode = dict.get('Decode', 'D'); - if (this.decode && !this.hasDefaultDecode()) { + this.needsDecode = false; + if (this.decode && this.colorSpace && + !this.colorSpace.isDefaultDecode(this.decode)) { + this.needsDecode = true; // Do some preprocessing to avoid more math. var max = (1 << bitsPerComponent) - 1; this.decodeCoefficients = []; @@ -128,12 +130,13 @@ var PDFImage = (function PDFImageClosure() { PDFImage.prototype = { getComponents: function getComponents(buffer) { var bpc = this.bpc; - var defaultDecode = this.hasDefaultDecode(); + var needsDecode = this.needsDecode; var decodeMap = this.decode; - if (decodeMap) console.time('getComps'); - // This image doesn't require extra work - if (bpc == 8 && defaultDecode) + + // This image doesn't require any extra work. + if (bpc == 8 && !needsDecode) return buffer; + var bufferLength = buffer.length; var width = this.width; var height = this.height; @@ -145,7 +148,7 @@ var PDFImage = (function PDFImageClosure() { bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length); var rowComps = width * numComps; var decodeAddends, decodeCoefficients; - if (!defaultDecode) { + if (needsDecode) { decodeAddends = this.decodeAddends; decodeCoefficients = this.decodeCoefficients; } @@ -156,7 +159,7 @@ var PDFImage = (function PDFImageClosure() { for (var i = 0, ii = length; i < ii; ++i) { var compIndex = i % numComps; var value = buffer[i]; - value = decode(value, decodeAddends[compIndex], + value = decodeAndClamp(value, decodeAddends[compIndex], decodeCoefficients[compIndex], max); output[i] = value; } @@ -201,9 +204,9 @@ var PDFImage = (function PDFImageClosure() { var remainingBits = bits - bpc; var value = buf >> remainingBits; - if (!defaultDecode) { + if (needsDecode) { var compIndex = i % numComps; - value = decode(value, decodeAddends[compIndex], + value = decodeAndClamp(value, decodeAddends[compIndex], decodeCoefficients[compIndex], max); } output[i] = value; @@ -304,22 +307,6 @@ var PDFImage = (function PDFImageClosure() { getImageBytes: function getImageBytes(length) { this.image.reset(); return this.image.getBytes(length); - }, - hasDefaultDecode: function hasDefaultDecode() { - // TODO lab color as a way different decode map - if (!this.decode) - return true; - var numComps = this.numComps; - var decode = this.decode; - if (numComps * 2 !== decode.length) { - warning('The decode map is not the correct length'); - return true; - } - for (var i = 0, ii = decode.length; i < ii; i += 2) { - if (decode[i] != 0 || decode[i + 1] != 1) - return false; - } - return true; } }; return PDFImage; From 9d042ce16661b3453581786f701e172594ba5a13 Mon Sep 17 00:00:00 2001 From: Brendan Dahl Date: Wed, 14 Dec 2011 08:47:35 -0800 Subject: [PATCH 4/5] Use the general function for is default decode. --- src/colorspace.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/colorspace.js b/src/colorspace.js index 87d0083c0..8088ab7df 100644 --- a/src/colorspace.js +++ b/src/colorspace.js @@ -354,8 +354,7 @@ var DeviceRgbCS = (function DeviceRgbCSClosure() { return rgbBuf; }, isDefaultDecode: function rgbcs_isDefaultDecode(decodeMap) { - return 0 == decodeMap[0] == decodeMap[2] == decodeMap[4] && - 1 == decodeMap[1] == decodeMap[3] == decoeMap[5]; + ColorSpace.isDefaultDecode(decodeMap, this.numComps); } }; return DeviceRgbCS; From 8096d747c0f0ff85f9a39b43e56d7c2153cc9913 Mon Sep 17 00:00:00 2001 From: Brendan Dahl Date: Thu, 15 Dec 2011 15:13:48 -0800 Subject: [PATCH 5/5] Fix nits. --- src/canvas.js | 4 ++-- src/image.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/canvas.js b/src/canvas.js index e056fe0f2..e42f53cf1 100644 --- a/src/canvas.js +++ b/src/canvas.js @@ -1106,9 +1106,9 @@ var CanvasGraphics = (function CanvasGraphicsClosure() { paintImageXObject: function canvasGraphicsPaintImageXObject(objId) { var imgData = this.objs.get(objId); - if (!imgData) { + if (!imgData) error('Dependent image isn\'t ready yet'); - } + this.save(); var ctx = this.ctx; var w = imgData.width; diff --git a/src/image.js b/src/image.js index 2f99dee54..22a9f9eb4 100644 --- a/src/image.js +++ b/src/image.js @@ -214,7 +214,6 @@ var PDFImage = (function PDFImageClosure() { bits = remainingBits; } } - if(decodeMap) console.timeEnd('getComps'); return output; }, getOpacity: function getOpacity() {