Skip to content

Commit 4cfc552

Browse files
arturadibarturadib
committed
Merge branch 'master' of git://github.com/mozilla/pdf.js into text-select
Conflicts: src/canvas.js web/viewer.js
2 parents a185318 + 2e70984 commit 4cfc552

28 files changed

+4653
-134
lines changed

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ PDF_JS_FILES = \
3333
pattern.js \
3434
stream.js \
3535
worker.js \
36+
../external/jpgjs/jpg.js \
3637
$(NULL)
3738

3839
# make server

‎examples/helloworld/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<script type="text/javascript" src="../../src/pattern.js"></script>
2323
<script type="text/javascript" src="../../src/stream.js"></script>
2424
<script type="text/javascript" src="../../src/worker.js"></script>
25+
<script type="text/javascript" src="../../external/jpgjs/jpg.js"></script>
2526

2627
<script type="text/javascript">
2728
// Specify the main script used to create a new PDF.JS web worker.

‎external/jasmine/MIT.LICENSE

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright (c) 2008-2011 Pivotal Labs
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)