From 94a48cab82b3f98619e2777d02001a109c61baec Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Mon, 12 Dec 2011 15:09:05 -0800
Subject: [PATCH] Address Julian's comments.

---
 src/core.js                    |  8 ++++----
 src/image.js                   | 10 +++++-----
 test/pdfs/aboutstacks.pdf.link |  1 +
 test/test_manifest.json        |  8 ++++++++
 4 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 test/pdfs/aboutstacks.pdf.link

diff --git a/src/core.js b/src/core.js
index e97465599..dc44edb76 100644
--- a/src/core.js
+++ b/src/core.js
@@ -636,10 +636,10 @@ var PDFDoc = (function PDFDocClosure() {
           var size = width * height;
           var rgbaLength = size * 4;
           var buf = new Uint8Array(size * components);
-          var tempCanvas = new ScratchCanvas(width, height);
-          var tempCtx = tempCanvas.getContext('2d');
-          tempCtx.drawImage(img, 0, 0);
-          var data = tempCtx.getImageData(0, 0, width, height).data;
+          var tmpCanvas = new ScratchCanvas(width, height);
+          var tmpCtx = tmpCanvas.getContext('2d');
+          tmpCtx.drawImage(img, 0, 0);
+          var data = tmpCtx.getImageData(0, 0, width, height).data;
 
           if (components == 3) {
             for (var i = 0, j = 0; i < rgbaLength; i += 4, j += 3) {
diff --git a/src/image.js b/src/image.js
index cc7242ad5..987542c58 100644
--- a/src/image.js
+++ b/src/image.js
@@ -84,17 +84,17 @@ var PDFImage = (function PDFImageClosure() {
    */
   PDFImage.buildImage = function buildImage(callback, handler, xref, res,
                                                image, inline) {
-    var promise = new Promise();
+    var imageDataPromise = new Promise();
     var smaskPromise = new Promise();
-    var promises = [promise, smaskPromise];
     // The image data and smask data may not be ready yet, wait till both are
     // resolved.
-    Promise.all(promises).then(function(results) {
-      var image = new PDFImage(xref, res, results[0], inline, results[1]);
+    Promise.all([imageDataPromise, smaskPromise]).then(function(results) {
+      var imageData = results[0], smaskData = results[1];
+      var image = new PDFImage(xref, res, imageData, inline, smaskData);
       callback(image);
     });
 
-    handleImageData(handler, xref, res, image, promise);
+    handleImageData(handler, xref, res, image, imageDataPromise);
 
     var smask = xref.fetchIfRef(image.dict.get('SMask'));
     if (smask)
diff --git a/test/pdfs/aboutstacks.pdf.link b/test/pdfs/aboutstacks.pdf.link
new file mode 100644
index 000000000..8b04ec042
--- /dev/null
+++ b/test/pdfs/aboutstacks.pdf.link
@@ -0,0 +1 @@
+http://greenhousechallenge.org/media/item/313/38/About-Stacks.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
index 4d55ac0f7..813fc272b 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -340,5 +340,13 @@
        "link": true,
        "pageLimit": 3,
        "type": "eq"
+    },
+    {
+      "id": "aboutstacks",
+      "file": "pdfs/aboutstacks.pdf",
+      "md5": "6e7c8416a293ba2d83bc8dd20c6ccf51",
+      "rounds": 1,
+      "link": true,
+      "type": "eq"
     }
 ]