From 31d8d13ba294f2e16ca984aedd932a23748b33f5 Mon Sep 17 00:00:00 2001
From: notmasteryet <async.processingjs@yahoo.com>
Date: Tue, 21 Feb 2012 19:56:35 -0600
Subject: [PATCH] Fix merge with symbol font fix (part 2)

---
 src/fonts.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/fonts.js b/src/fonts.js
index 0651485fc..3955f9136 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -1957,10 +1957,9 @@ var Font = (function FontClosure() {
         // Moving all symbolic font glyphs into 0xF000 - 0xF0FF range.
         if (this.isSymbolicFont) {
           for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var cid = i + 1;
-            var code = glyphs[i].unicode;
-            code = kSymbolicFontGlyphOffset | (code & 0xFF);
-            glyphs[i].unicode = toFontChar[cid] = code;
+            var code = glyphs[i].unicode & 0xFF;
+            var fontCharCode = kSymbolicFontGlyphOffset | code;
+            glyphs[i].unicode = toFontChar[code] = fontCharCode;
           }
           this.useToFontChar = true;
         }