Commit Graph

13 Commits

Author SHA1 Message Date
Brendan Dahl
faa202df1e Merge upstream and change test pdf file. 2011-11-22 10:39:26 -08:00
notmasteryet
ef58ccd284 Issue #644: bypassing identity cmap translation loading; resetting color space when stroke/fill color set 2011-11-15 18:23:45 -06:00
notmasteryet
60744a8a61 Merge branch 'master' of git://github.com/mozilla/pdf.js.git into encoding-2
Conflicts:
	src/evaluator.js
	src/fonts.js
2011-11-12 11:09:19 -06:00
Brendan Dahl
9bb2b881b0 Adds cmyk jpg support. Treats the cmyk jpg as a regular stream. 2011-11-08 08:48:10 -08:00
Kalervo Kujala
b321768f59 Remove unused parameters and fix jslint warnings. 2011-11-06 22:16:35 +02:00
Artur Adib
249385b4bb Progress 2011-11-02 15:08:19 -04:00
Brendan Dahl
3592baf39c Merge upstream 2011-10-31 08:51:45 -07:00
notmasteryet
7f038536fb Migration of the 'encoding-1' branch (ref #674) 2011-10-28 20:38:31 -05:00
Brendan Dahl
5cb64fbab7 Initial alpha transparency support. 2011-10-28 14:10:10 -07:00
Kalervo Kujala
7e6a589074 Fix js strict warning in worker.js.
Also fix a few minor nits.
2011-10-27 21:51:10 +03:00
Artur Adib
41caf5018d Merge branch 'refs/heads/master' into filesplit
Conflicts:
	pdf.js
2011-10-26 15:10:58 -04:00
Artur Adib
e71b6188c6 'use strict' everywhere 2011-10-25 18:18:22 -07:00
Artur Adib
a7278b7fbc Splitting files 2011-10-24 16:55:23 -07:00