From 438e3c8f6d2bd5af38a158cfae20be90760cda80 Mon Sep 17 00:00:00 2001
From: Pimm Hogeling <pimmhogeling@gmail.com>
Date: Fri, 31 Aug 2012 13:37:44 +0200
Subject: [PATCH] Fixes for subtile bugs that were introduced in
 59283bdf6d439fdcd1a0ab07b318b48031091b34 and
 99440ab6912dee9b780d28b9c425434f4afd8e44, among others.

---
 external/jpgjs/jpg.js | 9 +++++----
 src/colorspace.js     | 2 +-
 src/core.js           | 2 +-
 src/fonts.js          | 2 +-
 src/function.js       | 2 +-
 src/worker.js         | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/external/jpgjs/jpg.js b/external/jpgjs/jpg.js
index 941d01a87..6873fc6c3 100644
--- a/external/jpgjs/jpg.js
+++ b/external/jpgjs/jpg.js
@@ -516,6 +516,10 @@ var JpegImage = (function jpegImage() {
     return lines;
   }
 
+  function clampTo8bit(a) {
+    return a < 0 ? 0 : a > 255 ? 255 : a;
+  }
+
   constructor.prototype = {
     load: function load(path) {
       var xhr = new XMLHttpRequest();
@@ -766,9 +770,6 @@ var JpegImage = (function jpegImage() {
       }
     },
     getData: function getData(width, height) {
-      function clampTo8bit(a) {
-        return a < 0 ? 0 : a > 255 ? 255 : a;
-      }
       var scaleX = this.width / width, scaleY = this.height / height;
 
       var component1, component2, component3, component4;
@@ -935,4 +936,4 @@ var JpegImage = (function jpegImage() {
   };
 
   return constructor;
-})();
\ No newline at end of file
+})();
diff --git a/src/colorspace.js b/src/colorspace.js
index 5d6eee7a7..0c8f48b57 100644
--- a/src/colorspace.js
+++ b/src/colorspace.js
@@ -179,7 +179,7 @@ var ColorSpace = (function ColorSpaceClosure() {
       return true;
 
     if (n * 2 !== decode.length) {
-      warning('The decode map is not the correct length');
+      warn('The decode map is not the correct length');
       return true;
     }
     for (var i = 0, ii = decode.length; i < ii; i += 2) {
diff --git a/src/core.js b/src/core.js
index aa366a6db..704bc7356 100644
--- a/src/core.js
+++ b/src/core.js
@@ -222,7 +222,7 @@ var Page = (function PageClosure() {
     },
     getLinks: function Page_getLinks() {
       var links = [];
-      var annotations = pageGetAnnotations();
+      var annotations = this.getAnnotations();
       var i, n = annotations.length;
       for (i = 0; i < n; ++i) {
         if (annotations[i].type != 'Link')
diff --git a/src/fonts.js b/src/fonts.js
index 4af42265d..e2b760542 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -4671,7 +4671,7 @@ var CFFParser = (function CFFParserClosure() {
 
         var data = charstring;
         var length = data.length;
-        for (var j = 0; j <= length; j) {
+        for (var j = 0; j <= length;) {
           var value = data[j++];
           if (value == 12 && data[j++] == 0) {
               data[j - 2] = 139;
diff --git a/src/function.js b/src/function.js
index 2088ee219..5577aaf1e 100644
--- a/src/function.js
+++ b/src/function.js
@@ -153,7 +153,7 @@ var PDFFunction = (function PDFFunctionClosure() {
         var range = IR[9];
 
         if (m != args.length)
-          error('Incorrect number of arguments: ' + inputSize + ' != ' +
+          error('Incorrect number of arguments: ' + m + ' != ' +
                 args.length);
 
         var x = args;
diff --git a/src/worker.js b/src/worker.js
index 791a12d9c..3b3b68026 100644
--- a/src/worker.js
+++ b/src/worker.js
@@ -220,7 +220,7 @@ var WorkerMessageHandler = {
         return;
       }
 
-      console.log('page=%d - getOperatorList: time=%dms, len=%d', pageNum,
+      log('page=%d - getOperatorList: time=%dms, len=%d', pageNum,
                               Date.now() - start, operatorList.fnArray.length);
 
       // Filter the dependecies for fonts.
@@ -252,7 +252,7 @@ var WorkerMessageHandler = {
         promise.reject(e);
       }
 
-      console.log('text indexing: page=%d - time=%dms',
+      log('text indexing: page=%d - time=%dms',
                       pageNum, Date.now() - start);
     });
   }