Fix merge with symbol font fix

diff --git a/src/fonts.js b/src/fonts.js
index e0890c6fa0863e2c29d1ed59c2fe07aa9f14556d..0651485fcd01a23220b03f65ee975eda90801a44 100644 (file)
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -1957,9 +1957,10 @@ 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[i] = code;
+            glyphs[i].unicode = toFontChar[cid] = code;
           }
           this.useToFontChar = true;
         }