Merge branch 'refs/heads/master' into text-select
Conflicts: src/fonts.js
This commit is contained in:
commit
5c261b46cc
10 changed files with 781 additions and 547 deletions
|
@ -549,7 +549,7 @@ var CanvasGraphics = (function canvasGraphics() {
|
|||
this.save();
|
||||
ctx.scale(fontSize, fontSize);
|
||||
ctx.transform.apply(ctx, fontMatrix);
|
||||
this.executeIRQueue(glyph.IRQueue);
|
||||
this.executeIRQueue(glyph.codeIRQueue);
|
||||
this.restore();
|
||||
|
||||
var transformed = Util.applyTransform([glyph.width, 0], fontMatrix);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue