From a21030a5024640738b3ba1069110dc73a5d8858a Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Thu, 8 Dec 2011 17:13:17 -0500 Subject: [PATCH 1/4] Throw error when pixels don't match --- src/image.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/image.js b/src/image.js index 217e081c2..57c6d415f 100644 --- a/src/image.js +++ b/src/image.js @@ -198,6 +198,10 @@ var PDFImage = (function pdfImage() { var opacityPos = 0; var length = width * height * 4; + // Is there a one-to-one correspondence between pixels in the loop below? + if (length !== 4*comps.length/3) + error('Number of image pixels mismatch'); + for (var i = 0; i < length; i += 4) { buffer[i] = comps[compsPos++]; buffer[i + 1] = comps[compsPos++]; From fcbe4f13d100faee0c7da461601a6ae4811c797a Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Thu, 8 Dec 2011 18:19:36 -0500 Subject: [PATCH 2/4] More sanity checks --- src/image.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/image.js b/src/image.js index 57c6d415f..f24d28638 100644 --- a/src/image.js +++ b/src/image.js @@ -200,7 +200,7 @@ var PDFImage = (function pdfImage() { // Is there a one-to-one correspondence between pixels in the loop below? if (length !== 4*comps.length/3) - error('Number of image pixels mismatch'); + error('Number of image pixels mismatch (RGB)'); for (var i = 0; i < length; i += 4) { buffer[i] = comps[compsPos++]; @@ -226,6 +226,10 @@ var PDFImage = (function pdfImage() { var comps = this.getComponents(imgArray); var length = width * height; + // Is there a one-to-one correspondence between pixels in the loop below? + if (length !== comps.length) + error('Number of image pixels mismatch (Gray)'); + for (var i = 0; i < length; ++i) buffer[i] = comps[i]; } From de33e44b09504f38f36f72f62b448caddd8a8c7b Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Fri, 9 Dec 2011 14:57:52 -0500 Subject: [PATCH 3/4] Lint --- src/image.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/image.js b/src/image.js index f24d28638..a691bcd8c 100644 --- a/src/image.js +++ b/src/image.js @@ -199,7 +199,7 @@ var PDFImage = (function pdfImage() { var length = width * height * 4; // Is there a one-to-one correspondence between pixels in the loop below? - if (length !== 4*comps.length/3) + if (length !== 4 * comps.length / 3) error('Number of image pixels mismatch (RGB)'); for (var i = 0; i < length; i += 4) { From 2113e0615e835862d800b88bacccbdbf21c72c01 Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Mon, 12 Dec 2011 14:33:26 -0500 Subject: [PATCH 4/4] Reverting error(); warn() instead of TODO() --- src/image.js | 8 -------- src/parser.js | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/image.js b/src/image.js index a691bcd8c..217e081c2 100644 --- a/src/image.js +++ b/src/image.js @@ -198,10 +198,6 @@ var PDFImage = (function pdfImage() { var opacityPos = 0; var length = width * height * 4; - // Is there a one-to-one correspondence between pixels in the loop below? - if (length !== 4 * comps.length / 3) - error('Number of image pixels mismatch (RGB)'); - for (var i = 0; i < length; i += 4) { buffer[i] = comps[compsPos++]; buffer[i + 1] = comps[compsPos++]; @@ -226,10 +222,6 @@ var PDFImage = (function pdfImage() { var comps = this.getComponents(imgArray); var length = width * height; - // Is there a one-to-one correspondence between pixels in the loop below? - if (length !== comps.length) - error('Number of image pixels mismatch (Gray)'); - for (var i = 0; i < length; ++i) buffer[i] = comps[i]; } diff --git a/src/parser.js b/src/parser.js index 036191677..c307c9276 100644 --- a/src/parser.js +++ b/src/parser.js @@ -249,7 +249,7 @@ var Parser = (function parserParser() { if (name == 'CCITTFaxDecode' || name == 'CCF') { return new CCITTFaxStream(stream, params); } - TODO('filter "' + name + '" not supported yet'); + warn('filter "' + name + '" not supported yet'); return stream; } };