From 31cb9b49d502c387477e6c7f42da127243e6021b Mon Sep 17 00:00:00 2001
From: Kalervo Kujala <kkujala@com>
Date: Tue, 18 Oct 2011 00:00:44 +0300
Subject: [PATCH 1/2] Fix javascript strict warnings in driver.js.

---
 test/driver.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/driver.js b/test/driver.js
index 7f5aef733..b453c5051 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -66,7 +66,8 @@ function nextTask() {
   cleanup();
 
   if (currentTaskIdx == manifest.length) {
-    return done();
+    done();
+    return;
   }
   var task = manifest[currentTaskIdx];
   task.round = 0;
@@ -86,7 +87,7 @@ function nextTask() {
 }
 
 function isLastPage(task) {
-  return task.pageNum > task.pdfDoc.numPages || task.pageNum > task.pageLimit;
+  return task.pageNum > (task.pageLimit || task.pdfDoc.numPages);
 }
 
 function canvasToDataURL() {

From ecf831b44bb712dca16dfb1616140cc1faf99202 Mon Sep 17 00:00:00 2001
From: Kalervo Kujala <kkujala@com>
Date: Tue, 18 Oct 2011 20:32:33 +0300
Subject: [PATCH 2/2] Use task.pageLimit properly.

---
 test/driver.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/driver.js b/test/driver.js
index b453c5051..4b42c40b5 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -87,7 +87,11 @@ function nextTask() {
 }
 
 function isLastPage(task) {
-  return task.pageNum > (task.pageLimit || task.pdfDoc.numPages);
+  var limit = task.pageLimit || 0;
+  if (!limit || limit > task.pdfDoc.numPages)
+   limit = task.pdfDoc.numPages;
+
+  return task.pageNum > limit;
 }
 
 function canvasToDataURL() {