From: Andreas Gal <andreas.gal@gmail.com>
Date: Mon, 27 Jun 2011 03:46:10 +0000 (-0700)
Subject: Merge pull request #96 from vingtetun/master
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=94dae7e57031b900d7b49c4454355166dab5ad9e;p=pdf.js.git

Merge pull request #96 from vingtetun/master

Fix windows/mac font loading detection. r=gal
---

94dae7e57031b900d7b49c4454355166dab5ad9e
diff --cc viewer.html
index b8e3fff,7bb06ee..24213f7
--- a/viewer.html
+++ b/viewer.html
@@@ -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 3dffa81,c7adee8..5db2eff
--- a/viewer.js
+++ 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();