Skip to content

Commit f4e5b2b

Browse files
committed
Merge remote branch 'upstream/master'
2 parents aee8542 + 30bf683 commit f4e5b2b

18 files changed

+849
-318
lines changed

README

Lines changed: 0 additions & 12 deletions
This file was deleted.

README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# pdf.js
2+
3+
pdf.js is a technology demonstrator prototype to explore whether the HTML5
4+
platform is complete enough to faithfully and efficiently render the ISO
5+
32000-1:2008 Portable Document Format (PDF) without native code assistance.
6+
7+
pdf.js is not currently part of the Mozilla project, and there is no plan
8+
yet to integrate it into Firefox. We will explore that possibility once
9+
pdf.js is production ready. Until then we aim to publish a Firefox
10+
PDF reader extension powered by pdf.js.
11+
12+
You can read more about pdf.js here:
13+
14+
http://andreasgal.com/2011/06/15/pdf-js/
15+
http://blog.mozilla.com/cjones/2011/06/15/overview-of-pdf-js-guts/
16+
17+
follow us on twitter: @pdfjs
18+
19+
http://twitter.com/#!/pdfjs
20+
21+
join our mailing list:
22+
23+
dev-pdf-js@lists.mozilla.org
24+
25+
and talk to us on IRC:
26+
27+
#pdfjs on irc.mozilla.org

crypto.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/* -*- Mode: Java; tab-width: s; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
2-
/* vim: set shiftwidth=s tabstop=2 autoindent cindent expandtab: */
1+
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
2+
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
33

44
"use strict";
55

@@ -45,12 +45,12 @@ var ARCFourCipher = (function() {
4545
})();
4646

4747
var md5 = (function() {
48-
const r = new Uint8Array([
48+
var r = new Uint8Array([
4949
7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
5050
5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
5151
4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
5252
6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
53-
const k = new Int32Array([
53+
var k = new Int32Array([
5454
-680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426,
5555
-1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162,
5656
1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632,
@@ -149,7 +149,7 @@ var CipherTransform = (function() {
149149

150150
var CipherTransformFactory = (function() {
151151
function prepareKeyData(fileId, password, ownerPassword, userPassword, flags, revision, keyLength) {
152-
const defaultPasswordBytes = new Uint8Array([
152+
var defaultPasswordBytes = new Uint8Array([
153153
0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, 0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
154154
0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
155155
var hashData = new Uint8Array(88), i = 0, j, n;

0 commit comments

Comments
 (0)