Merge to upstream

This commit is contained in:
Vivien Nicolas 2011-06-13 19:16:03 +02:00
commit 3973b01ec9
6 changed files with 588 additions and 697 deletions

View File

@ -3,6 +3,7 @@
Contributors: Andreas Gal <gal@mozilla.com> Contributors: Andreas Gal <gal@mozilla.com>
Chris G Jones <cjones@mozilla.com> Chris G Jones <cjones@mozilla.com>
Shaon Barman <shaon.barman@gmail.com>
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),

View File

@ -564,7 +564,7 @@ var Type1Parser = function(aAsciiStream, aBinaryStream) {
var decryptedString = []; var decryptedString = [];
var value = ""; var value = "";
var count = aStream.length - aStream.start; var count = aStream.length;
for (var i = 0; i < count; i++) { for (var i = 0; i < count; i++) {
value = aStream.getByte(); value = aStream.getByte();
decryptedString[i] = String.fromCharCode(value ^ (r >> 8)); decryptedString[i] = String.fromCharCode(value ^ (r >> 8));

Binary file not shown.

1252
pdf.js

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,5 @@
<html> <html>
<<<<<<< HEAD
<head> <head>
<title>Simple pdf.js page viewer</title> <title>Simple pdf.js page viewer</title>
<link rel="stylesheet" href="test.css"></link> <link rel="stylesheet" href="test.css"></link>
@ -16,6 +17,7 @@
<button onclick="nextPage();">Next</button> <button onclick="nextPage();">Next</button>
<input type="text" id="pageNumber" onchange="gotoPage(this.value);" <input type="text" id="pageNumber" onchange="gotoPage(this.value);"
value="1" size="4"></input> value="1" size="4"></input>
<span id="numPages">--</span>
<span id="info"></span> <span id="info"></span>
</div> </div>

28
test.js
View File

@ -5,9 +5,23 @@ var pdfDocument, canvas, pageDisplay, pageNum;
function load() { function load() {
canvas = document.getElementById("canvas"); canvas = document.getElementById("canvas");
canvas.mozOpaque = true; canvas.mozOpaque = true;
open("uncompressed.tracemonkey-pldi-09.pdf"); pageNum = parseInt(queryParams().page) || 1;
fileName = queryParams().file || "compressed.tracemonkey-pldi-09.pdf";
open(fileName);
} }
function queryParams() {
var qs = window.location.search.substring(1);
var kvs = qs.split("&");
var params = { };
for (var i = 0; i < kvs.length; ++i) {
var kv = kvs[i].split("=");
params[unescape(kv[0])] = unescape(kv[1]);
}
return params;
}
function open(url) { function open(url) {
document.title = url; document.title = url;
req = new XMLHttpRequest(); req = new XMLHttpRequest();
@ -19,12 +33,20 @@ function open(url) {
var data = req.mozResponseArrayBuffer || req.mozResponse || var data = req.mozResponseArrayBuffer || req.mozResponse ||
req.responseArrayBuffer || req.response; req.responseArrayBuffer || req.response;
pdfDocument = new PDFDoc(new Stream(data)); pdfDocument = new PDFDoc(new Stream(data));
displayPage(1); numPages = pdfDocument.numPages;
document.getElementById("numPages").innerHTML = numPages.toString();
goToPage(pageNum);
} }
}; };
req.send(null); req.send(null);
} }
function gotoPage(num) {
if (0 <= num && num <= numPages)
pageNum = num;
displayPage(pageNum);
}
function displayPage(num) { function displayPage(num) {
document.getElementById("pageNumber").value = num; document.getElementById("pageNumber").value = num;
@ -59,7 +81,7 @@ function prevPage() {
displayPage(--pageNum); displayPage(--pageNum);
} }
function gotoPage(num) { function goToPage(num) {
if (0 <= num && num <= numPages) if (0 <= num && num <= numPages)
displayPage(pageNum = num); displayPage(pageNum = num);
} }