]> git.parisson.com Git - pdf.js.git/commitdiff
Merge pull request #96 from vingtetun/master
authorAndreas Gal <andreas.gal@gmail.com>
Mon, 27 Jun 2011 03:46:10 +0000 (20:46 -0700)
committerAndreas Gal <andreas.gal@gmail.com>
Mon, 27 Jun 2011 03:46:10 +0000 (20:46 -0700)
Fix windows/mac font loading detection. r=gal

1  2 
fonts.js
viewer.html
viewer.js

diff --cc fonts.js
Simple merge
diff --cc viewer.html
index b8e3fffb83f6875e94eaf4914ae472f2239ba26a,7bb06ee35d95d059e53e6df9ad3625d8979df1d7..24213f7d6a8b181bc365d33dfdff8d2fc104e5e7
@@@ -5,8 -5,8 +5,9 @@@
  
          <script type="text/javascript" src="viewer.js"></script>
          <script type="text/javascript" src="pdf.js"></script>
+         <script type="text/javascript" src="utils/fonts_utils.js"></script>
          <script type="text/javascript" src="fonts.js"></script>
 +        <script type="text/javascript" src="crypto.js"></script>
          <script type="text/javascript" src="glyphlist.js"></script>
    </head>
  
diff --cc viewer.js
index 3dffa8144e1056173c631aa6c9f41a5b93eaead7,c7adee892292bb102bc0d137cee57d64fb989ed6..5db2effdab59a405dbb4ef6b4694a3fb6354f715
+++ b/viewer.js
@@@ -59,11 -60,9 +60,13 @@@ function displayPage(num) 
      var t0 = Date.now();
  
      var page = pdfDocument.getPage(pageNum = num);
+     canvas.width = parseInt(canvas.getAttribute("defaultwidth")) * pageScale;
+     canvas.height = parseInt(canvas.getAttribute("defaultheight")) * pageScale;
  
 +    // scale canvas by 2
 +    canvas.width = 2 * page.mediaBox[2];
 +    canvas.hieght = 2 * page.mediaBox[3];
 +
      var t1 = Date.now();
      var ctx = canvas.getContext("2d");
      ctx.save();