From: notmasteryet <async.processingjs@yahoo.com>
Date: Mon, 12 Sep 2011 23:14:18 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into charstoglyphs
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=40e0cb40a670f47ff76971bcf0bbcade6ef9bb13;p=pdf.js.git

Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into charstoglyphs

Conflicts:
	fonts.js
---

40e0cb40a670f47ff76971bcf0bbcade6ef9bb13
diff --cc fonts.js
index ac070ed,9ba1d87..404c3f8
--- a/fonts.js
+++ b/fonts.js
@@@ -1347,7 -1357,7 +1347,7 @@@ var Font = (function Font() 
        }
  
        // Enter the translated string into the cache
-       return charsCache[chars] = glyphs;
 -      return (charsCache[chars] = str);
++      return (charsCache[chars] = glyphs);
      }
    };