From: sbarman <sbarman@L3CWZ5T.(none)>
Date: Thu, 21 Jul 2011 18:29:15 +0000 (-0700)
Subject: Merge branch 'master' into font
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=870027136a464c29495e52c713d68efa29995436;p=pdf.js.git

Merge branch 'master' into font
---

870027136a464c29495e52c713d68efa29995436
diff --cc fonts.js
index 57e974e,76facb5..77ad85a
--- a/fonts.js
+++ b/fonts.js
@@@ -385,8 -377,8 +383,9 @@@ var Font = (function Font() 
          warn('Font ' + properties.type + ' is not supported');
          break;
      }
 +
      this.data = data;
+     this.textMatrix = properties.textMatrix || IDENTITY_MATRIX;
      this.type = properties.type;
      this.loadedName = getUniqueName();
      this.compositeFont = properties.compositeFont;