From 06c4c83edf65eb7a62d70d68b3f0614824c3f31b Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Tue, 17 Jan 2012 14:40:52 -0500 Subject: [PATCH 1/3] Fixes #1055 by falling back to page resources --- src/evaluator.js | 8 ++++---- test/test_manifest.json | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/evaluator.js b/src/evaluator.js index 60ab66560..7916b50c8 100644 --- a/src/evaluator.js +++ b/src/evaluator.js @@ -292,8 +292,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() { // Create an IR of the pattern code. var depIdx = dependencyArray.length; var queueObj = {}; - var codeIR = this.getIRQueue(pattern, dict.get('Resources'), - queueObj, dependencyArray); + var codeIR = this.getIRQueue(pattern, dict.get('Resources') + || resources, queueObj, dependencyArray); // Add the dependencies that are required to execute the // codeIR. @@ -336,8 +336,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() { // This adds the IRQueue of the xObj to the current queue. var depIdx = dependencyArray.length; - this.getIRQueue(xobj, xobj.dict.get('Resources'), queue, - dependencyArray); + this.getIRQueue(xobj, xobj.dict.get('Resources') || resources, + queue, dependencyArray); // Add the dependencies that are required to execute the // codeIR. diff --git a/test/test_manifest.json b/test/test_manifest.json index 8598e4bc8..fa7ec7123 100644 --- a/test/test_manifest.json +++ b/test/test_manifest.json @@ -403,5 +403,12 @@ "pageLimit": 3, "link": true, "type": "load" + }, + { "id": "issue1055", + "file": "pdfs/issue1055.pdf", + "md5": "3ba56c2e48dce81da8669b1b9cf98ff0", + "rounds": 1, + "link": true, + "type": "eq" } ] From a6f62fc45a4edc75c86593aa9811fe720f570602 Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Tue, 17 Jan 2012 14:44:35 -0500 Subject: [PATCH 2/3] Missing file --- test/pdfs/issue1055.pdf.link | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/pdfs/issue1055.pdf.link diff --git a/test/pdfs/issue1055.pdf.link b/test/pdfs/issue1055.pdf.link new file mode 100644 index 000000000..8e2e7107c --- /dev/null +++ b/test/pdfs/issue1055.pdf.link @@ -0,0 +1 @@ +http://mcpherrin.ca/code/mozilla/engl208b.pdf From f97bc8df6ff09760e1d8c10fc0a5806d769079fa Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Tue, 17 Jan 2012 14:45:57 -0500 Subject: [PATCH 3/3] Lint --- src/evaluator.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/evaluator.js b/src/evaluator.js index 7916b50c8..21530f42f 100644 --- a/src/evaluator.js +++ b/src/evaluator.js @@ -292,8 +292,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() { // Create an IR of the pattern code. var depIdx = dependencyArray.length; var queueObj = {}; - var codeIR = this.getIRQueue(pattern, dict.get('Resources') - || resources, queueObj, dependencyArray); + var codeIR = this.getIRQueue(pattern, dict.get('Resources') || + resources, queueObj, dependencyArray); // Add the dependencies that are required to execute the // codeIR. @@ -336,7 +336,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() { // This adds the IRQueue of the xObj to the current queue. var depIdx = dependencyArray.length; - this.getIRQueue(xobj, xobj.dict.get('Resources') || resources, + this.getIRQueue(xobj, xobj.dict.get('Resources') || resources, queue, dependencyArray); // Add the dependencies that are required to execute the