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

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

View file

@ -550,7 +550,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var current = this.current;
if (!fontObj)
throw 'Can\'t find font for ' + fontRefName;
error('Can\'t find font for ' + fontRefName);
// Slice-clone matrix so we can manipulate it without affecting original
if (fontObj.fontMatrix)
@ -889,7 +889,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
} else if (IR[0] == 'RadialAxial' || IR[0] == 'Dummy') {
var pattern = Pattern.shadingFromIR(this.ctx, IR);
} else {
throw 'Unkown IR type';
error('Unkown IR type ' + IR[0]);
}
return pattern;
},