This commit is contained in:
notmasteryet 2012-02-14 23:06:16 -06:00
parent 16bd59edf0
commit 6c7e7df6da
2 changed files with 7 additions and 6 deletions

View File

@ -1790,8 +1790,8 @@ var Font = (function FontClosure() {
for (var i = 1; i < numGlyphs; i++) {
var cid = gidToCidMap[i] || i;
var unicode = this.toFontChar[cid];
if (!unicode || typeof unicode !== 'number' || isSpecialUnicode(unicode) ||
unicode in usedUnicodes) {
if (!unicode || typeof unicode !== 'number' ||
isSpecialUnicode(unicode) || unicode in usedUnicodes) {
unassignedUnicodeItems.push(i);
continue;
}
@ -1837,7 +1837,8 @@ var Font = (function FontClosure() {
var usedUnicodes = [], unassignedUnicodeItems = [];
for (var i = 0, ii = glyphs.length; i < ii; i++) {
var unicode = toFontChar[i + 1];
if (!unicode || typeof unicode !== 'number' || unicode in usedUnicodes) {
if (!unicode || typeof unicode !== 'number' ||
unicode in usedUnicodes) {
unassignedUnicodeItems.push(i);
continue;
}

View File

@ -1044,9 +1044,9 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
// Adjust div width to match canvas text
// Due to the .offsetWidth calls, this is slow
// This needs to come after appending to the DOM
CustomStyle.setProp('transform' , textDiv, 'scale('
+ textDiv.dataset.canvasWidth/textDiv.offsetWidth
+ ',1)');
var textScale = textDiv.dataset.canvasWidth / textDiv.offsetWidth;
CustomStyle.setProp('transform' , textDiv,
'scale(' + textScale + ', 1)');
CustomStyle.setProp('transformOrigin' , textDiv, '0% 0%');
}
} // textLength > 0