mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-26 10:08:06 +02:00
Code Activity

Merge branch 'refs/heads/master' into issue-1049

Browse source 
Conflicts:
	src/canvas.js
This commit is contained in:
Artur Adib 2012-01-31 13:20:05 -05:00
commit 7873ec966b
22 changed files with 4646 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/fonts.js
View file

@ -2235,9 +2235,8 @@ var Font = (function FontClosure() {
}
// MacRoman encoding address by re-encoding the cmap table
unicode = glyphName in GlyphsUnicode ?
GlyphsUnicode[glyphName] :
this.glyphNameMap[glyphName];
unicode = glyphName in this.glyphNameMap ?
this.glyphNameMap[glyphName] : GlyphsUnicode[glyphName];
break;
default:
warn('Unsupported font type: ' + this.type);