From: Vivien Nicolas <21@vingtetun.org>
Date: Thu, 30 Jun 2011 09:50:53 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/andreasgal/pdf.js
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ce17e9481f4b4ab0aa882815c799f03ef0c29c84;p=pdf.js.git

Merge branch 'master' of https://github.com/andreasgal/pdf.js
---

ce17e9481f4b4ab0aa882815c799f03ef0c29c84
diff --cc fonts.js
index df17951,f154cdd..5a7a41c
--- a/fonts.js
+++ b/fonts.js
@@@ -1025,9 -844,9 +1038,9 @@@ var Font = (function () 
              warn("Is " + fontName + " loaded?");
            }
          }
 -        
 +
          window.clearInterval(interval);
-         Fonts[fontName].loading = false;
+         Fonts.lookup(fontName).loading = false;
          this.start = 0;
          if (callback) {
            callback();